Move the worker to start under the machine agent.

Author: ericsnowcurrently

cmd/jujud/agent/machine/manifolds.go

@@ -25,6 +25,7 @@ import (
 	"github.com/juju/juju/worker/gate"
 	"github.com/juju/juju/worker/hostkeyreporter"
 	"github.com/juju/juju/worker/identityfilewriter"
+	"github.com/juju/juju/worker/logforwarder"
 	"github.com/juju/juju/worker/logger"
 	"github.com/juju/juju/worker/logsender"
 	"github.com/juju/juju/worker/machineactions"
@@ -399,6 +400,10 @@ func Manifolds(config ManifoldsConfig) dependency.Manifolds {
 			NewFacade:     hostkeyreporter.NewFacade,
 			NewWorker:     hostkeyreporter.NewWorker,
 		})),
+		logForwarderName: ifFullyUpgraded(logforwarder.Manifold(logforwarder.ManifoldConfig{
+			StateName:     stateName,
+			APICallerName: apiCallerName,
+		})),
 	}
 }
 
@@ -445,4 +450,5 @@ const (
 	apiConfigWatcherName     = "api-config-watcher"
 	machineActionName        = "machine-action-runner"
 	hostKeyReporterName      = "host-key-reporter"
+	logForwarderName         = "log-forwarder"
 )

cmd/jujud/agent/model/manifolds.go

@@ -29,7 +29,6 @@ import (
 	"github.com/juju/juju/worker/gate"
 	"github.com/juju/juju/worker/instancepoller"
 	"github.com/juju/juju/worker/lifeflag"
-	"github.com/juju/juju/worker/logforwarder"
 	"github.com/juju/juju/worker/metricworker"
 	"github.com/juju/juju/worker/migrationmaster"
 	"github.com/juju/juju/worker/provisioner"
@@ -247,10 +246,6 @@ func Manifolds(config ManifoldsConfig) dependency.Manifolds {
 			// TODO(fwereade): 2016-03-17 lp:1558657
 			NewTimer: worker.NewTimer,
 		})),
-		logForwarderName: ifNotDead(logforwarder.Manifold(logforwarder.ManifoldConfig{
-			APICallerName: apiCallerName,
-			AgentName:     agentName,
-		})),
 	}
 }
 
@@ -319,5 +314,4 @@ const (
 	metricWorkerName         = "metric-worker"
 	stateCleanerName         = "state-cleaner"
 	statusHistoryPrunerName  = "status-history-pruner"
-	logForwarderName         = "log-forwarder"
 )

worker/logforwarder/manifold.go

@@ -6,7 +6,7 @@ package logforwarder
 import (
 	"github.com/juju/errors"
 
-	"github.com/juju/juju/agent"
+	apiagent "github.com/juju/juju/api/agent"
 	"github.com/juju/juju/api/base"
 	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
@@ -15,7 +15,7 @@ import (
 // ManifoldConfig defines the names of the manifolds on which a
 // Manifold will depend.
 type ManifoldConfig struct {
-	AgentName     string
+	StateName     string
 	APICallerName string
 }
 
@@ -24,7 +24,7 @@ type ManifoldConfig struct {
 func Manifold(config ManifoldConfig) dependency.Manifold {
 	return dependency.Manifold{
 		Inputs: []string{
-			config.AgentName,
+			config.StateName, // ...just to force it to run only on the controller.
 			config.APICallerName,
 		},
 		Start: func(context dependency.Context) (worker.Worker, error) {
@@ -33,9 +33,13 @@ func Manifold(config ManifoldConfig) dependency.Manifold {
 				return nil, errors.Trace(err)
 			}
 
-			var agent agent.Agent
-			if err := context.Get(config.AgentName, &agent); err != nil {
-				return nil, errors.Trace(err)
+			agentFacade := apiagent.NewState(apiCaller)
+			modelConfig, err := agentFacade.ModelConfig()
+			if err != nil {
+				return nil, errors.Annotate(err, "cannot read environment config")
+			}
+			if modelConfig.Name() != environs.ControllerModelName {
+				return nil, errors.New("model-level log forwarding not supported")
 			}
 
 			return nil, errors.Errorf("finish me")