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/sources/DataSourceCloudStack.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/sources/DataSourceCloudStack.py')
| -rw-r--r-- | cloudinit/sources/DataSourceCloudStack.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py index 81c8cda9..08f661e4 100644 --- a/cloudinit/sources/DataSourceCloudStack.py +++ b/cloudinit/sources/DataSourceCloudStack.py @@ -4,11 +4,13 @@ # Copyright (C) 2012 Cosmin Luta # Copyright (C) 2012 Yahoo! Inc. # Copyright (C) 2012 Gerard Dethier +# Copyright (C) 2013 Hewlett-Packard Development Company, L.P. # # Author: Cosmin Luta <q4break@gmail.com> # Author: Scott Moser <scott.moser@canonical.com> # Author: Joshua Harlow <harlowja@yahoo-inc.com> # Author: Gerard Dethier <g.dethier@gmail.com> +# Author: Juerg Haefliger <juerg.haefliger@hp.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License version 3, as @@ -109,8 +111,8 @@ class DataSourceCloudStack(sources.DataSource): int(time.time() - start_time)) return True except Exception: - util.logexc(LOG, ('Failed fetching from metadata ' - 'service %s'), self.metadata_address) + util.logexc(LOG, 'Failed fetching from metadata service %s', + self.metadata_address) return False def get_instance_id(self): |