LEFT | RIGHT |
1 package apiserver | 1 package apiserver |
2 | 2 |
3 import ( | 3 import ( |
4 "code.google.com/p/go.net/websocket" | 4 "code.google.com/p/go.net/websocket" |
5 "fmt" | 5 "fmt" |
6 "launchpad.net/juju-core/charm" | 6 "launchpad.net/juju-core/charm" |
7 "launchpad.net/juju-core/juju" | 7 "launchpad.net/juju-core/juju" |
8 "launchpad.net/juju-core/log" | 8 "launchpad.net/juju-core/log" |
9 "launchpad.net/juju-core/state" | 9 "launchpad.net/juju-core/state" |
10 "launchpad.net/juju-core/state/api" | 10 "launchpad.net/juju-core/state/api" |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 func (aw srvClientAllWatcher) Stop() error { | 282 func (aw srvClientAllWatcher) Stop() error { |
283 return aw.w.(*multiwatcher.Watcher).Stop() | 283 return aw.w.(*multiwatcher.Watcher).Stop() |
284 } | 284 } |
285 | 285 |
286 // ServiceSet implements the server side of Client.ServerSet. | 286 // ServiceSet implements the server side of Client.ServerSet. |
287 func (c *srvClient) ServiceSet(p params.ServiceSet) error { | 287 func (c *srvClient) ServiceSet(p params.ServiceSet) error { |
288 svc, err := c.root.srv.state.Service(p.ServiceName) | 288 svc, err := c.root.srv.state.Service(p.ServiceName) |
289 if err != nil { | 289 if err != nil { |
290 return err | 290 return err |
291 } | 291 } |
292 » return svc.Set(p.Options) | 292 » return svc.SetConfig(p.Options) |
293 } | 293 } |
294 | 294 |
295 // ServiceSetYAML implements the server side of Client.ServerSetYAML. | 295 // ServiceSetYAML implements the server side of Client.ServerSetYAML. |
296 func (c *srvClient) ServiceSetYAML(p params.ServiceSetYAML) error { | 296 func (c *srvClient) ServiceSetYAML(p params.ServiceSetYAML) error { |
297 svc, err := c.root.srv.state.Service(p.ServiceName) | 297 svc, err := c.root.srv.state.Service(p.ServiceName) |
298 if err != nil { | 298 if err != nil { |
299 return err | 299 return err |
300 } | 300 } |
301 » return svc.SetYAML([]byte(p.Config)) | 301 » return svc.SetConfigYAML([]byte(p.Config)) |
302 } | 302 } |
303 | 303 |
304 // ServiceGet returns the configuration for a service. | 304 // ServiceGet returns the configuration for a service. |
305 func (c *srvClient) ServiceGet(args params.ServiceGet) (params.ServiceGetResults
, error) { | 305 func (c *srvClient) ServiceGet(args params.ServiceGet) (params.ServiceGetResults
, error) { |
306 return statecmd.ServiceGet(c.root.srv.state, args) | 306 return statecmd.ServiceGet(c.root.srv.state, args) |
307 } | 307 } |
308 | 308 |
309 // Resolved implements the server side of Client.Resolved. | 309 // Resolved implements the server side of Client.Resolved. |
310 func (c *srvClient) Resolved(p params.Resolved) error { | 310 func (c *srvClient) Resolved(p params.Resolved) error { |
311 unit, err := c.root.srv.state.Unit(p.UnitName) | 311 unit, err := c.root.srv.state.Unit(p.UnitName) |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
668 func (ws *watchers) stopAll() { | 668 func (ws *watchers) stopAll() { |
669 ws.mu.Lock() | 669 ws.mu.Lock() |
670 defer ws.mu.Unlock() | 670 defer ws.mu.Unlock() |
671 for _, w := range ws.ws { | 671 for _, w := range ws.ws { |
672 if err := w.w.Stop(); err != nil { | 672 if err := w.w.Stop(); err != nil { |
673 log.Errorf("state/api: error stopping %T watcher: %v", w
, err) | 673 log.Errorf("state/api: error stopping %T watcher: %v", w
, err) |
674 } | 674 } |
675 } | 675 } |
676 ws.ws = make(map[string]*srvWatcher) | 676 ws.ws = make(map[string]*srvWatcher) |
677 } | 677 } |
LEFT | RIGHT |