diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2018-02-15 14:28:59 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2018-02-15 19:08:29 +0000 |
| commit | 3afbcfff2f6e3faf50c0dffee55e7c48b50755b5 (patch) | |
| tree | 44d4a5d80868fe6a8defe57f6cc9c21feae59a03 /azurelinuxagent/agent.py | |
| parent | 6c9cd7e1ac55aae259d8e2f06569375e27a12f20 (diff) | |
| parent | 7e7d885433a2bac56ce2361126bf7ec3d565fd66 (diff) | |
| download | vyos-walinuxagent-3afbcfff2f6e3faf50c0dffee55e7c48b50755b5.tar.gz vyos-walinuxagent-3afbcfff2f6e3faf50c0dffee55e7c48b50755b5.zip | |
Import patches-applied version 2.2.21+really2.2.20-0ubuntu1~16.04.1 to applied/ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: 6c9cd7e1ac55aae259d8e2f06569375e27a12f20
Unapplied parent: 7e7d885433a2bac56ce2361126bf7ec3d565fd66
New changelog entries:
* Backport bionic version to xenial.
* Revert to an older upstream release: 2.2.20 (LP: #1749589).
- Rename upstream tarball to 2.2.21+really2.2.20 to end up with a
temporarily higher version number than what's in the archive.
* debian/patches/disable_import_test.patch: refreshed patch.
Diffstat (limited to 'azurelinuxagent/agent.py')
| -rw-r--r-- | azurelinuxagent/agent.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/azurelinuxagent/agent.py b/azurelinuxagent/agent.py index 4ab7aa0..e99f7be 100644 --- a/azurelinuxagent/agent.py +++ b/azurelinuxagent/agent.py @@ -63,9 +63,6 @@ class Agent(object): path="/var/log/waagent.log") logger.add_logger_appender(logger.AppenderType.CONSOLE, level, path="/dev/console") - logger.add_logger_appender(logger.AppenderType.TELEMETRY, - logger.LogLevel.WARNING, - path=event.add_log_event) ext_log_dir = conf.get_ext_log_dir() try: @@ -147,7 +144,7 @@ def main(args=[]): if command == "version": version() elif command == "help": - print(usage()) + usage() elif command == "start": start(conf_file_path=conf_file_path) else: @@ -231,16 +228,15 @@ def version(): def usage(): """ - Return agent usage message + Show agent usage """ - s = "\n" - s += ("usage: {0} [-verbose] [-force] [-help] " + print("") + print((("usage: {0} [-verbose] [-force] [-help] " "-configuration-path:<path to configuration file>" "-deprovision[+user]|-register-service|-version|-daemon|-start|" - "-run-exthandlers|-show-configuration]" - "").format(sys.argv[0]) - s += "\n" - return s + "-run-exthandlers]" + "").format(sys.argv[0]))) + print("") def start(conf_file_path=None): """ |