worker: Introducing StringsWorker

worker/machiner/machiner.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 package machiner
 
 import (
-        "fmt"
-
         "launchpad.net/loggo"
 
         "launchpad.net/juju-core/errors"
         "launchpad.net/juju-core/state/api"
         "launchpad.net/juju-core/state/api/machiner"
         "launchpad.net/juju-core/state/api/params"
         "launchpad.net/juju-core/worker"
 )
 
 var logger = loggo.GetLogger("juju.worker.machiner")
 
 // Machiner is responsible for a machine agent's lifecycle.
 type Machiner struct {
         st      *machiner.State
         tag     string
         machine *machiner.Machine
 }
 
-// NewMachiner returns a Machiner that will wait for the identified machine
+// NewMachiner returns a Worker that will wait for the identified machine
 // to become Dying and make it Dead; or until the machine becomes Dead by
 // other means.
-func NewMachiner(st *machiner.State, tag string) worker.NotifyWorker {
+func NewMachiner(st *machiner.State, tag string) worker.Worker {
         mr := &Machiner{st: st, tag: tag}
         return worker.NewNotifyWorker(mr)
-}
-
-func (mr *Machiner) String() string {
-        return fmt.Sprintf("machiner for %s", mr.tag)
 }
 
 func isNotFoundOrUnauthorized(err error) bool {
         return errors.IsNotFoundError(err) || params.ErrCode(err) == params.CodeUnauthorized
 }
 
 func (mr *Machiner) SetUp() (api.NotifyWatcher, error) {
         // Find which machine we're responsible for.
         m, err := mr.st.Machine(mr.tag)
         if isNotFoundOrUnauthorized(err) {
@@ skipping 34 matching lines @@
                 logger.Errorf("%s falied to set machine to dead: %v", mr, err)
                 return err
         }
         return worker.ErrTerminateAgent
 }
 
 func (mr *Machiner) TearDown() error {
         // Nothing to do here.
         return nil
 }