Browse Source

Merge pull request 'zones: fix `jpictl dump` by explicitly omitting Machine.logger and Zone.logger' (#15)

Reviewed-on: #15
pull/16/head v0.5.4
Alejandro Mery 10 months ago
parent
commit
7795610caf
  1. 4
      pkg/zones/machine.go
  2. 4
      pkg/zones/zones.go

4
pkg/zones/machine.go

@ -9,8 +9,8 @@ import (
// A Machine is a machine on a Zone // A Machine is a machine on a Zone
type Machine struct { type Machine struct {
zone *Zone zone *Zone
logger logger `toml:"-" json:"-" yaml:"-"`
ID int `toml:"id"` ID int `toml:"id"`
Name string `toml:"-" json:"-" yaml:"-"` Name string `toml:"-" json:"-" yaml:"-"`

4
pkg/zones/zones.go

@ -87,8 +87,8 @@ func FilterMachines(m MachineIterator, cond func(*Machine) bool) (Machines, int)
// Zone represents one zone in a cluster // Zone represents one zone in a cluster
type Zone struct { type Zone struct {
zones *Zones zones *Zones
logger logger `toml:"-" json:"-" yaml:"-"`
ID int `toml:"id"` ID int `toml:"id"`
Name string `toml:"name"` Name string `toml:"name"`

Loading…
Cancel
Save