Reviewers: mp+123187_code.launchpad.net,
Message: Please take a look.
Description: Also cleans up some trivials in the presence package.
https://code.launchpad.net/~niemeyer/juju-core/stop-presence-watcher/+merge/123187
(do not edit description out of merge proposal)
Please review this at https://codereview.appspot.com/6510043/
Affected files: A [revision details] M mstate/open.go M mstate/presence/presence.go M mstate/presence/presence_test.go
Index: [revision details] === added file '[revision details]' --- [revision details] 2012-01-01 00:00:00 +0000 +++ [revision details] 2012-01-01 00:00:00 +0000 @@ -0,0 +1,2 @@ +Old revision: <email address hidden> +New revision: <email address hidden>
Index: mstate/open.go === modified file 'mstate/open.go' --- mstate/open.go 2012-09-05 08:23:01 +0000 +++ mstate/open.go 2012-09-06 22:12:07 +0000 @@ -43,7 +43,8 @@ return st, nil }
-func (st *State) Close() (err error) { +func (st *State) Close() error { + err := st.presencew.Stop() st.db.Session.Close() - return + return err }
Index: mstate/presence/presence.go === modified file 'mstate/presence/presence.go' --- mstate/presence/presence.go 2012-09-04 11:45:47 +0000 +++ mstate/presence/presence.go 2012-09-06 22:12:07 +0000 @@ -70,7 +70,7 @@ // the the gorotuine loop. request chan interface{}
- // refreshed contains pending ForcedRefresh done channels + // refreshed contains pending ForceRefresh done channels // that are waiting for the completion notice. refreshed []chan bool
@@ -92,7 +92,7 @@ Alive bool }
-// New returns a new Watcher. +// NewWatcher returns a new Watcher. func NewWatcher(base *mgo.Collection) *Watcher { w := &Watcher{ base: base,
Index: mstate/presence/presence_test.go === modified file 'mstate/presence/presence_test.go' --- mstate/presence/presence_test.go 2012-09-04 10:25:43 +0000 +++ mstate/presence/presence_test.go 2012-09-06 22:12:07 +0000 @@ -3,7 +3,6 @@ import ( "labix.org/v2/mgo" . "launchpad.net/gocheck" - state "launchpad.net/juju-core/mstate" "launchpad.net/juju-core/mstate/presence" "launchpad.net/juju-core/testing" "strconv" @@ -15,17 +14,11 @@ testing.MgoTestPackage(t) }
-var ( - period = 50 * time.Millisecond - longEnough = period * 6 -) - type PresenceSuite struct { testing.MgoSuite testing.LoggingSuite presence *mgo.Collection pings *mgo.Collection - state *state.State }
var _ = Suite(&PresenceSuite{}) @@ -48,15 +41,10 @@ s.presence = db.C("presence") s.pings = db.C("presence.pings")
- var err error - s.state, err = state.Dial(testing.MgoAddr) - c.Assert(err, IsNil) - presence.FakeTimeSlot(0) }
func (s *PresenceSuite) TearDownTest(c *C) { - s.state.Close() s.MgoSuite.TearDownTest(c) s.LoggingSuite.TearDownTest(c)
« Back to merge proposal
Reviewers: mp+123187_ code.launchpad. net,
Message:
Please take a look.
Description:
Also cleans up some trivials in the presence package.
https:/ /code.launchpad .net/~niemeyer/ juju-core/ stop-presence- watcher/ +merge/ 123187
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/6510043/
Affected files: presence/ presence. go presence/ presence_ test.go
A [revision details]
M mstate/open.go
M mstate/
M mstate/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: mstate/open.go
=== modified file 'mstate/open.go'
--- mstate/open.go 2012-09-05 08:23:01 +0000
+++ mstate/open.go 2012-09-06 22:12:07 +0000
@@ -43,7 +43,8 @@
return st, nil
}
-func (st *State) Close() (err error) { Session. Close()
+func (st *State) Close() error {
+ err := st.presencew.Stop()
st.db.
- return
+ return err
}
Index: mstate/ presence/ presence. go presence/ presence. go' presence/ presence. go 2012-09-04 11:45:47 +0000 presence/ presence. go 2012-09-06 22:12:07 +0000
=== modified file 'mstate/
--- mstate/
+++ mstate/
@@ -70,7 +70,7 @@
// the the gorotuine loop.
request chan interface{}
- // refreshed contains pending ForcedRefresh done channels
+ // refreshed contains pending ForceRefresh done channels
// that are waiting for the completion notice.
refreshed []chan bool
@@ -92,7 +92,7 @@
Alive bool
}
-// New returns a new Watcher.
+// NewWatcher returns a new Watcher.
func NewWatcher(base *mgo.Collection) *Watcher {
w := &Watcher{
base: base,
Index: mstate/ presence/ presence_ test.go presence/ presence_ test.go' presence/ presence_ test.go 2012-09-04 10:25:43 +0000 presence/ presence_ test.go 2012-09-06 22:12:07 +0000 org/v2/ mgo" net/gocheck" net/juju- core/mstate" net/juju- core/mstate/ presence" net/juju- core/testing" MgoTestPackage( t)
=== modified file 'mstate/
--- mstate/
+++ mstate/
@@ -3,7 +3,6 @@
import (
"labix.
. "launchpad.
- state "launchpad.
"launchpad.
"launchpad.
"strconv"
@@ -15,17 +14,11 @@
testing.
}
-var ( LoggingSuite
- period = 50 * time.Millisecond
- longEnough = period * 6
-)
-
type PresenceSuite struct {
testing.MgoSuite
testing.
presence *mgo.Collection
pings *mgo.Collection
- state *state.State
}
var _ = Suite(& PresenceSuite{ }) pings")
@@ -48,15 +41,10 @@
s.presence = db.C("presence")
s.pings = db.C("presence.
- var err error testing. MgoAddr) FakeTimeSlot( 0)
- s.state, err = state.Dial(
- c.Assert(err, IsNil)
-
presence.
}
func (s *PresenceSuite) TearDownTest(c *C) { TearDownTest( c) te.TearDownTest (c)
- s.state.Close()
s.MgoSuite.
s.LoggingSui