1
=== modified file 'state/unit.go'
2
--- state/unit.go	2012-08-15 13:03:27 +0000
3
+++ state/unit.go	2012-08-15 15:48:21 +0000
4
@@ -33,6 +33,18 @@
5
33
	AssignUnused AssignmentPolicy = "unused"
33
	AssignUnused AssignmentPolicy = "unused"
6
34
)
34
)
7
35
35
8
36
// UnitStatus represents the status of the unit agent.
9
37
type UnitStatus string
10
38
11
39
const (
12
40
	UnitPending   UnitStatus = "pending"   // Agent hasn't started
13
41
	UnitInstalled UnitStatus = "installed" // Agent has run the installed hook
14
42
	UnitStarted   UnitStatus = "started"   // Agent is running properly
15
43
	UnitStopped   UnitStatus = "stopped"   // Agent has stopped running on request
16
44
	UnitError     UnitStatus = "error"     // Agent is waiting in an error state
17
45
	UnitDown      UnitStatus = "down"      // Agent is down or not communicating
18
46
)
19
47
20
36
// NeedsUpgrade describes if a unit needs an
48
// NeedsUpgrade describes if a unit needs an
21
37
// upgrade and if this is forced.
49
// upgrade and if this is forced.
22
38
type NeedsUpgrade struct {
50
type NeedsUpgrade struct {
23
@@ -157,6 +169,56 @@
24
157
		"private address of unit %q", u)
169
		"private address of unit %q", u)
25
158
}
170
}
26
159
171
27
172
// Status returns the status of the unit's agent.
28
173
func (u *Unit) Status() (UnitStatus, string, error) {
29
174
	cn, err := readConfigNode(u.st.zk, u.zkPath())
30
175
	if err != nil {
31
176
		return "", "", err
32
177
	}
33
178
	raw, found := cn.Get("status")
34
179
	if !found {
35
180
		return UnitPending, "", nil
36
181
	}
37
182
	status := UnitStatus(raw.(string))
38
183
	switch status {
39
184
	case UnitError:
40
185
		// We always expect an info if status is 'error'.
41
186
		raw, found = cn.Get("status-info")
42
187
		if !found {
43
188
			panic("no status-info for unit error found")
44
189
		}
45
190
		return status, raw.(string), nil
46
191
	case UnitStopped:
47
192
		return UnitStopped, "", nil
48
193
	}
49
194
	alive, err := u.AgentAlive()
50
195
	if err != nil {
51
196
		return "", "", err
52
197
	}
53
198
	if !alive {
54
199
		status = UnitDown
55
200
	}
56
201
	return status, "", nil
57
202
}
58
203
59
204
// SetStatus sets the status of the unit.
60
205
func (u *Unit) SetStatus(status UnitStatus, info string) error {
61
206
	if status == UnitPending {
62
207
		panic("unit status must not be set to pending")
63
208
	}
64
209
	cn, err := readConfigNode(u.st.zk, u.zkPath())
65
210
	if err != nil {
66
211
		return err
67
212
	}
68
213
	cn.Set("status", status)
69
214
	cn.Set("status-info", info)
70
215
	_, err = cn.Write()
71
216
	if err != nil {
72
217
		return fmt.Errorf("cannot set status of %q: %v", u, err)
73
218
	}
74
219
	return nil
75
220
}
76
221
77
160
// CharmURL returns the charm URL this unit is supposed
222
// CharmURL returns the charm URL this unit is supposed
78
161
// to use.
223
// to use.
79
162
func (u *Unit) CharmURL() (url *charm.URL, err error) {
224
func (u *Unit) CharmURL() (url *charm.URL, err error) {
80
163
225
81
=== modified file 'state/unit_test.go'
82
--- state/unit_test.go	2012-07-26 13:52:05 +0000
83
+++ state/unit_test.go	2012-08-15 15:48:21 +0000
84
@@ -44,6 +44,41 @@
85
44
	c.Assert(address, Equals, "example.local")
44
	c.Assert(address, Equals, "example.local")
86
45
}
45
}
87
46
46
88
47
func (s *UnitSuite) TestGetSetStatus(c *C) {
89
48
	fail := func() { s.unit.SetStatus(state.UnitPending, "") }
90
49
	c.Assert(fail, PanicMatches, "unit status must not be set to pending")
91
50
92
51
	status, info, err := s.unit.Status()
93
52
	c.Assert(err, IsNil)
94
53
	c.Assert(status, Equals, state.UnitPending)
95
54
	c.Assert(info, Equals, "")
96
55
97
56
	err = s.unit.SetStatus(state.UnitStarted, "")
98
57
	c.Assert(err, IsNil)
99
58
	status, info, err = s.unit.Status()
100
59
	c.Assert(err, IsNil)
101
60
	c.Assert(status, Equals, state.UnitDown)
102
61
	c.Assert(info, Equals, "")
103
62
104
63
	p, err := s.unit.SetAgentAlive()
105
64
	c.Assert(err, IsNil)
106
65
	defer func() {
107
66
		c.Assert(p.Kill(), IsNil)
108
67
	}()
109
68
110
69
	status, info, err = s.unit.Status()
111
70
	c.Assert(err, IsNil)
112
71
	c.Assert(status, Equals, state.UnitStarted)
113
72
	c.Assert(info, Equals, "")
114
73
115
74
	err = s.unit.SetStatus(state.UnitError, "test-hook failed")
116
75
	c.Assert(err, IsNil)
117
76
	status, info, err = s.unit.Status()
118
77
	c.Assert(err, IsNil)
119
78
	c.Assert(status, Equals, state.UnitError)
120
79
	c.Assert(info, Equals, "test-hook failed")
121
80
}
122
81
123
47
func (s *UnitSuite) TestUnitCharm(c *C) {
82
func (s *UnitSuite) TestUnitCharm(c *C) {
124
48
	testcurl, err := s.unit.CharmURL()
83
	testcurl, err := s.unit.CharmURL()
125
49
	c.Assert(err, IsNil)
84
	c.Assert(err, IsNil)
Reviewer	Review Type	Date Requested	Status
The Go Language Gophers		2012-08-07	Pending
Review via email: mp+118549@code.launchpad.net