← Back to branch summary

~rogpeppe/juju-core/themue-058-debug-log-api

« back to all changes in this revision

Viewing changes to cmd/juju/status.go

  • Committer: Frank Mueller
  • Date: 2014-01-21 08:46:24 UTC
  • mfrom: (2152.1.76 juju-core)
  • Revision ID: frank.mueller@canonical.com-20140121084624-rv32dv6ufzul9h1b
debugger: merged trunk and added access to debugger API facade

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/juju/status.go
154
154
type serviceStatus struct {
155
155
        Err           error                 `json:"-" yaml:",omitempty"`
156
156
        Charm         string                `json:"charm" yaml:"charm"`
 
157
        CanUpgradeTo  string                `json:"can-upgrade-to,omitempty" yaml:"can-upgrade-to,omitempty"`
157
158
        Exposed       bool                  `json:"exposed" yaml:"exposed"`
158
159
        Life          string                `json:"life,omitempty" yaml:"life,omitempty"`
159
160
        Relations     map[string][]string   `json:"relations,omitempty" yaml:"relations,omitempty"`
181
182
 
182
183
type unitStatus struct {
183
184
        Err            error                 `json:"-" yaml:",omitempty"`
 
185
        Charm          string                `json:"upgrading-from,omitempty" yaml:"upgrading-from,omitempty"`
184
186
        AgentState     params.Status         `json:"agent-state,omitempty" yaml:"agent-state,omitempty"`
185
187
        AgentStateInfo string                `json:"agent-state-info,omitempty" yaml:"agent-state-info,omitempty"`
186
188
        AgentVersion   string                `json:"agent-version,omitempty" yaml:"agent-version,omitempty"`
254
256
                Exposed:       service.Exposed,
255
257
                Life:          service.Life,
256
258
                Relations:     service.Relations,
 
259
                CanUpgradeTo:  service.CanUpgradeTo,
257
260
                SubordinateTo: service.SubordinateTo,
258
261
                Units:         make(map[string]unitStatus),
259
262
        }
273
276
                Machine:        unit.Machine,
274
277
                OpenedPorts:    unit.OpenedPorts,
275
278
                PublicAddress:  unit.PublicAddress,
 
279
                Charm:          unit.Charm,
276
280
                Subordinates:   make(map[string]unitStatus),
277
281
        }
278
282
        for k, m := range unit.Subordinates {