lp:~rogpeppe/juju-core/510-errorf-errgo
- Get this branch:
- bzr branch lp:~rogpeppe/juju-core/510-errorf-errgo
Branch merges
- Juju Engineering: Pending requested
-
Diff: 16062 lines (+1818/-1697)351 files modifiedagent/agent.go (+13/-14)
agent/bootstrap.go (+9/-8)
agent/format.go (+3/-1)
agent/tools/toolsdir.go (+9/-9)
bzr/bzr.go (+7/-6)
cert/cert.go (+9/-10)
cert/cert_test.go (+4/-4)
charm/bundle.go (+4/-3)
charm/charm.go (+3/-3)
charm/config.go (+10/-10)
charm/dir.go (+2/-1)
charm/meta.go (+9/-9)
charm/repo.go (+12/-10)
charm/url.go (+12/-11)
cloudinit/sshinit/configure.go (+2/-1)
cmd/charm-admin/config.go (+2/-3)
cmd/charm-admin/deletecharm.go (+2/-1)
cmd/charmd/main.go (+4/-2)
cmd/charmload/main.go (+3/-2)
cmd/cmd.go (+2/-2)
cmd/environmentcommand.go (+2/-2)
cmd/filevar.go (+2/-1)
cmd/juju/addmachine.go (+3/-3)
cmd/juju/addrelation.go (+2/-2)
cmd/juju/addunit.go (+2/-4)
cmd/juju/authorisedkeys_add.go (+1/-1)
cmd/juju/authorisedkeys_delete.go (+1/-1)
cmd/juju/authorisedkeys_import.go (+1/-1)
cmd/juju/bootstrap.go (+5/-5)
cmd/juju/bootstrap_test.go (+2/-1)
cmd/juju/constraints.go (+3/-4)
cmd/juju/debughooks.go (+4/-3)
cmd/juju/debuglog.go (+2/-1)
cmd/juju/deploy.go (+4/-4)
cmd/juju/destroyenvironment.go (+4/-4)
cmd/juju/destroymachine.go (+4/-5)
cmd/juju/destroyrelation.go (+2/-2)
cmd/juju/destroyservice.go (+3/-3)
cmd/juju/destroyunit.go (+2/-3)
cmd/juju/environment.go (+6/-6)
cmd/juju/expose.go (+1/-1)
cmd/juju/get.go (+1/-2)
cmd/juju/init.go (+3/-2)
cmd/juju/publish.go (+12/-11)
cmd/juju/resolved.go (+3/-4)
cmd/juju/run.go (+7/-7)
cmd/juju/scp.go (+4/-2)
cmd/juju/set.go (+2/-3)
cmd/juju/ssh.go (+5/-5)
cmd/juju/switch.go (+3/-3)
cmd/juju/synctools_test.go (+1/-1)
cmd/juju/unexpose.go (+1/-1)
cmd/juju/unset.go (+1/-2)
cmd/juju/upgradecharm.go (+8/-9)
cmd/juju/upgradejuju.go (+9/-11)
cmd/jujud/agent.go (+2/-2)
cmd/jujud/agent_test.go (+6/-10)
cmd/jujud/bootstrap.go (+3/-2)
cmd/jujud/machine.go (+14/-13)
cmd/jujud/main.go (+3/-2)
cmd/jujud/main_test.go (+3/-3)
cmd/jujud/run.go (+5/-5)
cmd/jujud/run_test.go (+2/-2)
cmd/jujud/unit.go (+2/-3)
cmd/output.go (+3/-3)
cmd/plugins/juju-metadata/imagemetadata.go (+7/-6)
cmd/plugins/juju-metadata/signmetadata.go (+6/-6)
cmd/plugins/juju-metadata/toolsmetadata.go (+2/-1)
cmd/plugins/juju-metadata/validateimagemetadata.go (+8/-7)
cmd/plugins/juju-metadata/validatetoolsmetadata.go (+6/-5)
cmd/plugins/juju-restore/restore.go (+34/-33)
cmd/supercommand.go (+4/-3)
cmd/supercommand_test.go (+2/-1)
cmd/util_test.go (+1/-1)
constraints/constraints.go (+16/-16)
container/factory/factory.go (+2/-2)
container/kvm/instance.go (+5/-3)
container/kvm/kvm.go (+3/-2)
container/kvm/libvirt.go (+3/-1)
container/kvm/mock/mock-kvm.go (+4/-2)
container/lxc/instance.go (+4/-3)
container/lxc/mock/mock-lxc.go (+7/-6)
downloader/downloader.go (+3/-3)
environs/authenticationprovider.go (+3/-3)
environs/boilerplate_config.go (+6/-4)
environs/bootstrap/bootstrap.go (+8/-9)
environs/bootstrap/bootstrap_test.go (+2/-2)
environs/bootstrap/state.go (+5/-5)
environs/bootstrap/synctools.go (+4/-4)
environs/cloudinit.go (+6/-8)
environs/cloudinit/cloudinit.go (+29/-29)
environs/config.go (+10/-9)
environs/config/authkeys.go (+3/-2)
environs/config/config.go (+17/-17)
environs/configstore/disk.go (+7/-8)
environs/configstore/interface.go (+1/-1)
environs/configstore/mem.go (+3/-2)
environs/emptystorage.go (+3/-2)
environs/errors.go (+1/-1)
environs/filestorage/filestorage.go (+3/-2)
environs/httpstorage/backend.go (+4/-3)
environs/httpstorage/storage.go (+7/-6)
environs/imagemetadata/upload.go (+2/-2)
environs/imagemetadata/urls.go (+3/-1)
environs/imagemetadata/validation.go (+7/-7)
environs/instances/image.go (+4/-2)
environs/instances/instancetype.go (+3/-2)
environs/jujutest/livetests.go (+4/-3)
environs/manual/bootstrap.go (+4/-3)
environs/manual/init.go (+6/-4)
environs/manual/provisioner.go (+3/-3)
environs/open.go (+15/-16)
environs/simplestreams/datasource.go (+3/-1)
environs/simplestreams/decode.go (+2/-2)
environs/simplestreams/simplestreams.go (+20/-19)
environs/sshstorage/linewrapwriter_test.go (+1/-1)
environs/sshstorage/storage.go (+14/-13)
environs/storage/storage.go (+3/-2)
environs/storage/storage_test.go (+3/-3)
environs/sync/sync.go (+2/-2)
environs/testing/storage.go (+3/-3)
environs/tools/boilerplate.go (+4/-3)
environs/tools/build.go (+6/-4)
environs/tools/simplestreams.go (+3/-1)
environs/tools/storage.go (+2/-1)
environs/tools/tools.go (+5/-6)
environs/tools/urls.go (+3/-1)
environs/tools/validation.go (+4/-4)
errors/errors_test.go (+4/-4)
instance/address_test.go (+1/-1)
instance/container.go (+2/-4)
instance/instance.go (+14/-13)
juju/api.go (+7/-7)
juju/apiconn_test.go (+5/-5)
juju/conn.go (+17/-17)
juju/deploy.go (+8/-8)
juju/osenv/vars_windows_test.go (+1/-1)
juju/testing/instance.go (+2/-3)
log/syslog/cmd.go (+5/-4)
names/tag.go (+5/-4)
provider/azure/config.go (+4/-3)
provider/azure/customdata.go (+3/-2)
provider/azure/environ.go (+13/-12)
provider/azure/instance.go (+4/-3)
provider/azure/instancetype.go (+3/-3)
provider/common/bootstrap.go (+12/-11)
provider/common/bootstrap_test.go (+8/-8)
provider/common/destroy_test.go (+5/-5)
provider/common/polling.go (+3/-2)
provider/common/polling_test.go (+1/-1)
provider/common/state.go (+4/-3)
provider/dummy/environs.go (+23/-23)
provider/ec2/config.go (+6/-7)
provider/ec2/ec2.go (+23/-22)
provider/ec2/image.go (+2/-2)
provider/ec2/storage.go (+4/-4)
provider/error.go (+1/-1)
provider/joyent/config.go (+5/-3)
provider/joyent/provider.go (+5/-7)
provider/local/environ.go (+7/-5)
provider/local/environprovider.go (+11/-10)
provider/local/environprovider_test.go (+1/-1)
provider/local/prereqs.go (+6/-5)
provider/maas/config.go (+4/-4)
provider/maas/environ.go (+5/-4)
provider/maas/environprovider.go (+1/-1)
provider/maas/storage.go (+6/-6)
provider/manual/environ.go (+5/-5)
provider/manual/environ_test.go (+1/-1)
provider/manual/provider.go (+6/-5)
provider/manual/provider_test.go (+2/-2)
provider/openstack/config.go (+5/-4)
provider/openstack/export_test.go (+3/-3)
provider/openstack/local_test.go (+4/-3)
provider/openstack/provider.go (+22/-22)
provider/openstack/storage.go (+4/-4)
replicaset/replicaset.go (+3/-3)
replicaset/replicaset_test.go (+4/-3)
rpc/client.go (+2/-1)
rpc/jsoncodec/codec.go (+2/-1)
rpc/jsoncodec/codec_test.go (+1/-1)
rpc/rpc_test.go (+12/-11)
rpc/rpcreflect/type.go (+2/-1)
rpc/server.go (+2/-2)
schema/schema.go (+4/-2)
state/addmachine.go (+25/-24)
state/address.go (+4/-2)
state/annotator.go (+3/-3)
state/api/agent/state.go (+2/-2)
state/api/client.go (+13/-11)
state/api/common/life.go (+2/-2)
state/api/deployer/machine.go (+2/-2)
state/api/firewaller/machine.go (+3/-3)
state/api/firewaller/service.go (+4/-2)
state/api/firewaller/unit.go (+5/-3)
state/api/keyupdater/authorisedkeys.go (+3/-3)
state/api/logger/logger.go (+3/-3)
state/api/machiner/machine.go (+2/-2)
state/api/params/params.go (+6/-4)
state/api/provisioner/machine.go (+10/-9)
state/api/provisioner/provisioner.go (+2/-2)
state/api/uniter/charm.go (+4/-3)
state/api/uniter/relation.go (+3/-1)
state/api/uniter/relationunit.go (+4/-4)
state/api/uniter/service.go (+6/-4)
state/api/uniter/unit.go (+12/-11)
state/api/uniter/uniter.go (+4/-4)
state/api/upgrader/upgrader.go (+5/-5)
state/apiserver/admin.go (+3/-2)
state/apiserver/charms.go (+41/-41)
state/apiserver/client/client.go (+29/-29)
state/apiserver/client/destroy.go (+3/-2)
state/apiserver/client/run.go (+3/-1)
state/apiserver/client/tools.go (+2/-2)
state/apiserver/common/common_test.go (+2/-2)
state/apiserver/common/ensuredead_test.go (+4/-5)
state/apiserver/common/environmachineswatcher.go (+2/-2)
state/apiserver/common/environmachineswatcher_test.go (+2/-3)
state/apiserver/common/environwatcher_test.go (+4/-5)
state/apiserver/common/errors.go (+10/-9)
state/apiserver/common/errors_test.go (+2/-3)
state/apiserver/common/instanceidgetter_test.go (+2/-1)
state/apiserver/common/life_test.go (+3/-4)
state/apiserver/common/password_test.go (+5/-4)
state/apiserver/common/remove.go (+2/-2)
state/apiserver/common/remove_test.go (+5/-6)
state/apiserver/common/setstatus_test.go (+4/-5)
state/apiserver/common/tools.go (+2/-2)
state/apiserver/common/tools_test.go (+3/-4)
state/apiserver/common/unitswatcher_test.go (+3/-4)
state/apiserver/common/watch_test.go (+3/-4)
state/apiserver/deployer/deployer.go (+2/-2)
state/apiserver/keymanager/keymanager.go (+13/-13)
state/apiserver/root.go (+1/-1)
state/apiserver/uniter/uniter.go (+2/-2)
state/apiserver/upgrader/upgrader.go (+1/-1)
state/apiserver/utils.go (+2/-2)
state/cleanup.go (+7/-8)
state/constraints.go (+2/-3)
state/endpoint.go (+2/-2)
state/machine.go (+24/-23)
state/megawatcher.go (+8/-8)
state/megawatcher_internal_test.go (+2/-2)
state/minimumunits.go (+1/-2)
state/multiwatcher/multiwatcher.go (+1/-1)
state/multiwatcher/multiwatcher_internal_test.go (+3/-3)
state/open.go (+8/-8)
state/policy.go (+2/-2)
state/prechecker_test.go (+3/-4)
state/presence/presence.go (+7/-6)
state/relation.go (+6/-6)
state/relationunit.go (+8/-8)
state/sequence.go (+2/-3)
state/service.go (+19/-19)
state/settings.go (+5/-4)
state/state.go (+57/-56)
state/state_test.go (+2/-1)
state/statecmd/destroymachines.go (+4/-3)
state/statecmd/machineconfig.go (+3/-3)
state/statecmd/status.go (+6/-4)
state/status.go (+6/-7)
state/unit.go (+36/-36)
state/user.go (+4/-4)
state/watcher.go (+3/-2)
state/watcher/helpers_test.go (+1/-2)
state/watcher/watcher.go (+5/-4)
store/branch.go (+6/-5)
store/config.go (+4/-4)
store/lpad.go (+3/-2)
store/store.go (+8/-8)
store/store_test.go (+2/-1)
testing/cert.go (+4/-3)
testing/charm.go (+7/-6)
testing/checkers/bool_test.go (+1/-1)
testing/checkers/deepequal.go (+3/-1)
testing/locking.go (+2/-1)
testing/locking_test.go (+3/-5)
testing/mgo.go (+4/-3)
testing/targz.go (+3/-1)
testing/testbase/patch_test.go (+1/-1)
tools/list.go (+3/-3)
upgrades/systemsshkey.go (+5/-4)
upgrades/upgrade_test.go (+1/-1)
upstart/upstart.go (+5/-4)
utils/apt.go (+3/-2)
utils/apt_test.go (+5/-6)
utils/fslock/fslock.go (+2/-2)
utils/network.go (+2/-2)
utils/parallel/try.go (+1/-1)
utils/parallel/try_test.go (+2/-2)
utils/password.go (+3/-2)
utils/ssh/authorisedkeys.go (+10/-9)
utils/ssh/clientkeys.go (+2/-2)
utils/ssh/fingerprint.go (+3/-1)
utils/ssh/generate.go (+2/-1)
utils/ssh/run.go (+4/-3)
utils/ssh/ssh.go (+2/-1)
utils/ssh/ssh_gocrypto.go (+7/-6)
utils/ssh/ssh_gocrypto_test.go (+1/-1)
utils/ssh/ssh_openssh.go (+4/-2)
utils/tailer/tailer_test.go (+5/-5)
utils/trivial.go (+1/-1)
utils/uuid.go (+3/-1)
version/version.go (+6/-5)
worker/deployer/deployer.go (+2/-3)
worker/deployer/simple.go (+4/-3)
worker/environ.go (+1/-2)
worker/firewaller/firewaller.go (+6/-6)
worker/instancepoller/machine_test.go (+3/-4)
worker/instancepoller/updater.go (+3/-3)
worker/instancepoller/updater_test.go (+1/-1)
worker/machiner/machiner.go (+4/-4)
worker/notifyworker_test.go (+8/-7)
worker/peergrouper/desired.go (+3/-3)
worker/peergrouper/desired_test.go (+3/-1)
worker/peergrouper/mock_test.go (+9/-8)
worker/peergrouper/worker.go (+7/-6)
worker/peergrouper/worker_test.go (+1/-1)
worker/provisioner/container_initialisation.go (+5/-3)
worker/provisioner/provisioner_task.go (+6/-5)
worker/rsyslog/worker.go (+7/-7)
worker/runner.go (+1/-1)
worker/runner_test.go (+8/-8)
worker/simpleworker_test.go (+1/-2)
worker/stringsworker_test.go (+8/-8)
worker/uniter/charm/charm.go (+4/-3)
worker/uniter/charm/deployer.go (+4/-2)
worker/uniter/charm/git.go (+5/-4)
worker/uniter/context.go (+3/-2)
worker/uniter/debug/server.go (+1/-1)
worker/uniter/hook/hook.go (+3/-3)
worker/uniter/jujuc/config-get.go (+2/-3)
worker/uniter/jujuc/context.go (+4/-3)
worker/uniter/jujuc/juju-log.go (+1/-1)
worker/uniter/jujuc/owner-get.go (+3/-5)
worker/uniter/jujuc/ports.go (+4/-4)
worker/uniter/jujuc/relation-get.go (+4/-3)
worker/uniter/jujuc/relation-ids.go (+2/-1)
worker/uniter/jujuc/relation-list.go (+3/-4)
worker/uniter/jujuc/relation-set.go (+4/-3)
worker/uniter/jujuc/server.go (+2/-1)
worker/uniter/jujuc/server_test.go (+3/-4)
worker/uniter/jujuc/unit-get.go (+3/-5)
worker/uniter/jujuc/util_test.go (+2/-1)
worker/uniter/modes.go (+6/-6)
worker/uniter/relation/relation.go (+11/-10)
worker/uniter/state.go (+9/-9)
worker/uniter/tools.go (+3/-2)
worker/uniter/uniter.go (+6/-6)
worker/upgrader/upgrader.go (+3/-3)
worker/upgrader/upgrader_test.go (+2/-2)
Branch information
Recent revisions
- 2366. By Martin Packman
-
[r=gz] cmd: Clarify deprecation hint for --verbose flag
A user in #juju was just confused by the message saying
not to use verbose but to use show-log instead, as it's
a flag, --show-log, not a command show-log. The wording
change in this branch should make it more obvious.https:/
/codereview. appspot. com/68180045/ R=axwalk
- 2365. By John A Meinel
-
[r=fwereade] Add the version of the Juju agent as it starts up.
We have a lot of logs that we come across, and it would be helpful if the agent version was more obvious. You can dig it of a SetTools call somewhere later in the file, but it seems pretty obvious to see it at "agent started" time.
So this adds that line for Machine and Unit agents.
- 2364. By Andrew Wilkins
-
[r=axwalk],[bug=1281071],[bug=1284020] Implement rsyslog TLS support
This changes the rsyslog configuration
we generate to use TLS. We install the
rsyslog-gnutls package and generate a
new CA cert, server cert and key
specifically for rsyslog.This completely changes the way rsyslog
configuration is managed. Now, instead
of writing at bootstrap time and having
an upgrade step, we have a worker that
writes the syslog config whenever syslog
parameters change. The state server will
generate certificates and propagate the
CA cert to other agents via environ config.There are some other miscellaneous changes:
- we now use reliable forwarding, as
otherwise the machine agent and unit
agent will restart rsyslog while
log messages are buffered causing
message loss
- dedicated upgrades for rsyslog are
redundant and removed. The new worker
upgrades machine and unit agent rsyslog
automatically.
- syslog-port can now be changed, and must
be changed to work around the privilege
drop race in rsyslog 5.x (this is the
sole motivation)
- the local provider symlinks machine-0.log
into /var/log/juju$namespace so that we
do not need any configuration other than
the existing namespace to determine log
locationFixes lp:1281071
Fixes lp:1284020
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~go-bot/juju-core/trunk