← Back to branch summary

~rogpeppe/juju-core/332-apiserver-factor-out-watchers

~rogpeppe/juju-core/332-apiserver-factor-out-watchers

« back to all changes in this revision

Viewing changes to cmd/jujud/unit.go

Committer: Roger Peppe
Date: 2013-06-27 11:32:16 UTC
mfrom: (1324.1.23 trunk)
Revision ID: roger.peppe@canonical.com-20130627113216-5v24uhwnv6mr9zak

merge trunk

files added:
state/apiserver/common/resource_test.go

state/apiserver/testing/fakeauthorizer.go

state/minimumunits.go

state/minimumunits_test.go

files removed:
state/apiserver/state.go

state/apiserver/user.go

files renamed:
state/apiserver/resource.go => state/apiserver/common/resource.go

state/apiserver/state_test.go => state/apiserver/pinger_test.go

files modified:
cmd/jujud/agent.go

cmd/jujud/deploy_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/unit.go

cmd/jujud/unit_test.go

container/lxc/instance.go

container/lxc/lxc.go

container/lxc/lxc_test.go

container/lxc/mock/mock-lxc.go

container/lxc/test.go

juju/testing/conn.go

state/api/apiclient.go

state/api/params/params.go

state/apiserver/client/client.go

state/apiserver/common/interfaces.go

state/apiserver/machine/agent_test.go

state/apiserver/machine/common_test.go

state/apiserver/machine/machiner.go

state/apiserver/machine/machiner_test.go

state/apiserver/root.go

state/apiserver/watchers/watcher.go

state/apiserver/watchers/watchers_test.go

state/export_test.go

state/open.go

state/service.go

state/state.go

state/unit.go

worker/deployer/deployer.go

worker/deployer/deployer_test.go

worker/provisioner/lxc-broker.go

worker/provisioner/lxc-broker_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_task.go

worker/provisioner/provisioner_test.go

Show diffs side-by-side

added added

removed removed

cmd/jujud/unit.go

87

87

runner.StartWorker("uniter", func() (worker.Worker, error) {

88

88

return uniter.NewUniter(st, unit.Name(), dataDir), nil

89

89

})

90

if unit.IsPrincipal() {

91

runner.StartWorker("deployer", func() (worker.Worker, error) {

92

return newDeployer(st, unit.WatchSubordinateUnits(), dataDir), nil

93

})

94

}

95

90

return newCloseWorker(runner, st), nil

96

91

}

97

92

Older »