merge reparent

fwereade · fwereade · commit ff09f687b7f6 · 2012-08-17T16:30:55.000+02:00
diff --git a/state/presence/presence.go b/state/presence/presence.go
@@ -70,8 +70,7 @@ func StartPinger(conn *zk.Conn, path string, period time.Duration) (*Pinger, err
 }
 
 // Start begins periodically refreshing the context of the Pinger's path.
-// Consecutive calls to Start will panic, and will attempts to Start a
-// Pinger that has been Killed.
+// Start panics if called consecutively or after Kill.
 func (p *Pinger) Start() error {
 	if p.tomb != nil {
 		panic("pinger is already started")
@@ -125,14 +124,14 @@ func (p *Pinger) Kill() error {
 
 // loop calls change on p.target every p.period nanoseconds until p is stopped.
 func (p *Pinger) loop() {
-	defer p.tomb.Done()
 	defer func() {
 		// If we haven't encountered an error, always send a final write, to
 		// ensure watchers detect the pinger's death as late as possible.
 		if p.tomb.Err() == nil {
 			_, err := p.target.change()
 			p.tomb.Kill(err)
 		}
+		p.tomb.Done()
 	}()
 	for {
 		select {
diff --git a/trivial/trivial.go b/trivial/trivial.go
@@ -27,7 +27,7 @@ func AtomicWrite(path string, obj interface{}) error {
 func EnsureDir(path string) error {
 	fi, err := os.Stat(path)
 	if os.IsNotExist(err) {
-		return os.Mkdir(path, 0755)
+		return os.MkdirAll(path, 0755)
 	} else if !fi.IsDir() {
 		return fmt.Errorf("%s must be a directory", path)
 	}

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func AtomicWrite(path string, obj interface{}) error {`
`27`	`27`	`func EnsureDir(path string) error {`
`28`	`28`	`fi, err := os.Stat(path)`
`29`	`29`	`if os.IsNotExist(err) {`
`30`		`- return os.Mkdir(path, 0755)`
	`30`	`+ return os.MkdirAll(path, 0755)`
`31`	`31`	`} else if !fi.IsDir() {`
`32`	`32`	`return fmt.Errorf("%s must be a directory", path)`
`33`	`33`	`}`