diff options
author | Juerg Haefliger <juergh@gmail.com> | 2013-06-20 15:46:08 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2013-06-20 15:46:08 -0400 |
commit | 852968303724c979b7a94ed69abdcff9c0e3cc93 (patch) | |
tree | 4d7a925f5f4f56d618c2d7d9b1971b0fb1a7fe08 /cloudinit/util.py | |
parent | 812f82e7b3bad3f8127face552c76ef974b54661 (diff) | |
parent | 2f853948f269f50038533782ee45e381d60d02bf (diff) | |
download | vyos-cloud-init-852968303724c979b7a94ed69abdcff9c0e3cc93.tar.gz vyos-cloud-init-852968303724c979b7a94ed69abdcff9c0e3cc93.zip |
fix and tidy up logexc usage
Some of the usages of logexc contain incorrect arguments to logexc.
cloudinit/config/cc_ssh_import_id.py
cloudinit/distros/__init__.py
The tidy up here is to fix many others that pass rendered strings
to logexc rather than letting it handle rendering at a later date (or
not at all in the case where logging is disabled).
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r-- | cloudinit/util.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index b27b3567..c45aae06 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1,7 +1,7 @@ # vi: ts=4 expandtab # # Copyright (C) 2012 Canonical Ltd. -# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. +# Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P. # Copyright (C) 2012 Yahoo! Inc. # # Author: Scott Moser <scott.moser@canonical.com> @@ -219,8 +219,7 @@ def fork_cb(child_cb, *args): child_cb(*args) os._exit(0) # pylint: disable=W0212 except: - logexc(LOG, ("Failed forking and" - " calling callback %s"), + logexc(LOG, "Failed forking and calling callback %s", type_utils.obj_name(child_cb)) os._exit(1) # pylint: disable=W0212 else: |