| Index: worker/localstorage/worker.go |
| === modified file 'worker/localstorage/worker.go' |
| --- provider/local/storage/worker.go 2013-08-30 04:07:04 +0000 |
| +++ worker/localstorage/worker.go 2013-09-16 04:57:13 +0000 |
| @@ -1,4 +1,7 @@ |
| -package storage |
| +// Copyright 2013 Canonical Ltd. |
| +// Licensed under the AGPLv3, see LICENCE file for details. |
| + |
| +package localstorage |
| import ( |
| "launchpad.net/loggo" |
| @@ -9,7 +12,7 @@ |
| "launchpad.net/juju-core/worker" |
| ) |
| -var logger = loggo.GetLogger("juju.local.storage") |
| +var logger = loggo.GetLogger("juju.worker.localstorage") |
| type storageWorker struct { |
| config agent.Config |
| @@ -49,14 +52,18 @@ |
| sharedStorageDir := s.config.Value(agent.SharedStorageDir) |
| sharedStorageAddr := s.config.Value(agent.SharedStorageAddr) |
| - logger.Infof("serving %s on %s", sharedStorageDir, sharedStorageAddr) |
| + if sharedStorageAddr != "" && sharedStorageDir != "" { |
| + logger.Infof("serving %s on %s", sharedStorageDir, sharedStorageAddr) |
| - sharedStorageListener, err := localstorage.Serve(sharedStorageAddr, sharedStorageDir) |
| - if err != nil { |
| - logger.Errorf("error with local storage: %v", err) |
| - return err |
| + sharedStorageListener, err := localstorage.Serve(sharedStorageAddr, sharedStorageDir) |
| + if err != nil { |
| + logger.Errorf("error with local storage: %v", err) |
| + return err |
| + } |
| + defer sharedStorageListener.Close() |
| + } else { |
| + logger.Infof("no shared storage: dir=%q addr=%q", sharedStorageDir, sharedStorageAddr) |
| } |
| - defer sharedStorageListener.Close() |
| logger.Infof("storage routines started, awaiting death") |
