Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(565)

Side by Side Diff: cmd/jujud/unit.go

Issue 8674043: deuglify logging for main packages. (Closed)
Patch Set: deuglify logging for main packages. Created 10 years, 11 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cmd/jujud/machine.go ('k') | cmd/jujud/upgrade.go » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 package main 1 package main
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 "launchpad.net/gnuflag" 5 "launchpad.net/gnuflag"
6 "launchpad.net/juju-core/cmd" 6 "launchpad.net/juju-core/cmd"
7 "launchpad.net/juju-core/log" 7 "launchpad.net/juju-core/log"
8 "launchpad.net/juju-core/state" 8 "launchpad.net/juju-core/state"
9 "launchpad.net/juju-core/worker/uniter" 9 "launchpad.net/juju-core/worker/uniter"
10 "launchpad.net/tomb" 10 "launchpad.net/tomb"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 func (a *UnitAgent) Stop() error { 46 func (a *UnitAgent) Stop() error {
47 a.tomb.Kill(nil) 47 a.tomb.Kill(nil)
48 return a.tomb.Wait() 48 return a.tomb.Wait()
49 } 49 }
50 50
51 // Run runs a unit agent. 51 // Run runs a unit agent.
52 func (a *UnitAgent) Run(ctx *cmd.Context) error { 52 func (a *UnitAgent) Run(ctx *cmd.Context) error {
53 if err := a.Conf.read(state.UnitTag(a.UnitName)); err != nil { 53 if err := a.Conf.read(state.UnitTag(a.UnitName)); err != nil {
54 return err 54 return err
55 } 55 }
56 » defer log.Noticef("cmd/jujud: unit agent exiting") 56 » defer log.Noticef("unit agent exiting")
57 defer a.tomb.Done() 57 defer a.tomb.Done()
58 err := RunAgentLoop(a.Conf.Conf, a) 58 err := RunAgentLoop(a.Conf.Conf, a)
59 if ug, ok := err.(*UpgradeReadyError); ok { 59 if ug, ok := err.(*UpgradeReadyError); ok {
60 if err1 := ug.ChangeAgentTools(); err1 != nil { 60 if err1 := ug.ChangeAgentTools(); err1 != nil {
61 err = err1 61 err = err1
62 // Return and let upstart deal with the restart. 62 // Return and let upstart deal with the restart.
63 } 63 }
64 } 64 }
65 return err 65 return err
66 } 66 }
(...skipping 16 matching lines...) Expand all
83 return st.Unit(a.UnitName) 83 return st.Unit(a.UnitName)
84 } 84 }
85 85
86 func (a *UnitAgent) Tag() string { 86 func (a *UnitAgent) Tag() string {
87 return state.UnitTag(a.UnitName) 87 return state.UnitTag(a.UnitName)
88 } 88 }
89 89
90 func (a *UnitAgent) Tomb() *tomb.Tomb { 90 func (a *UnitAgent) Tomb() *tomb.Tomb {
91 return &a.tomb 91 return &a.tomb
92 } 92 }
OLDNEW
« no previous file with comments | « cmd/jujud/machine.go ('k') | cmd/jujud/upgrade.go » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b