| Index: cmd/jujud/machine.go |
| === modified file 'cmd/jujud/machine.go' |
| --- cmd/jujud/machine.go 2012-10-11 13:32:58 +0000 |
| +++ cmd/jujud/machine.go 2012-10-25 10:24:27 +0000 |
| @@ -52,7 +52,8 @@ |
| func (a *MachineAgent) Run(_ *cmd.Context) error { |
| defer log.Printf("machiner: machine agent exiting") |
| defer a.tomb.Done() |
| - for a.tomb.Err() == tomb.ErrStillAlive { |
| +Loop: |
| + for { |
| log.Printf("machiner: machine agent starting") |
| err := a.runOnce() |
| if ug, ok := err.(*UpgradeReadyError); ok { |
| @@ -73,6 +74,7 @@ |
| select { |
| case <-a.tomb.Dying(): |
| a.tomb.Kill(err) |
| + break Loop |
| case <-time.After(retryDelay): |
| log.Printf("machiner: rerunning machiner") |
| } |
