diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-07-02 10:56:22 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-07-02 10:56:22 -0700 |
| commit | 879946c26f005f5ae5c2bbdd537beb295d7f4773 (patch) | |
| tree | d9036cd7fe1eee3cb5ce4510f4374a6bb7c95057 /cloudinit/util.py | |
| parent | 8037b4723ad641701750f9b4c9b7d7216bf50838 (diff) | |
| download | vyos-cloud-init-879946c26f005f5ae5c2bbdd537beb295d7f4773.tar.gz vyos-cloud-init-879946c26f005f5ae5c2bbdd537beb295d7f4773.zip | |
1. Move the welcome message template string to a constant at the top of the module
2. Fix the usage of multi_log to log to only one of the places (for now)
3. Update comment about multi-log and why write_file isn't used in this case
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index 6b23a0ee..4c29432b 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -275,15 +275,18 @@ def find_modules(root_dir): return entries -def multi_log(text, console=True, stderr=True, log=None): +def multi_log(text, console=True, stderr=True, + log=None, log_level=logging.DEBUG): if stderr: sys.stderr.write(text) if console: + # Don't use the write_file since + # this might be 'sensitive' info (not debug worthy?) with open('/dev/console', 'wb') as wfh: wfh.write(text) wfh.flush() if log: - log.debug(text) + log.log(log_level, text) def is_ipv4(instr): |