From 879946c26f005f5ae5c2bbdd537beb295d7f4773 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 2 Jul 2012 10:56:22 -0700 Subject: 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 --- cloudinit/config/cc_final_message.py | 3 ++- cloudinit/config/cc_keys_to_console.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'cloudinit/config') diff --git a/cloudinit/config/cc_final_message.py b/cloudinit/config/cc_final_message.py index 711e7b5b..b1caca47 100644 --- a/cloudinit/config/cc_final_message.py +++ b/cloudinit/config/cc_final_message.py @@ -55,7 +55,8 @@ def handle(_name, cfg, cloud, log, args): 'timestamp': ts, 'version': cver, } - util.multi_log("%s\n" % (templater.render_string(msg_in, subs))) + util.multi_log("%s\n" % (templater.render_string(msg_in, subs)), + console=False, stderr=True) except Exception: util.logexc(log, "Failed to render final message template") diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py index da7d5219..ed7af690 100644 --- a/cloudinit/config/cc_keys_to_console.py +++ b/cloudinit/config/cc_keys_to_console.py @@ -46,7 +46,8 @@ def handle(name, cfg, _cloud, log, _args): cmd.append(','.join(fp_blacklist)) cmd.append(','.join(key_blacklist)) (stdout, _stderr) = util.subp(cmd) - util.multi_log("%s\n" % (stdout.strip()), stderr=False) + util.multi_log("%s\n" % (stdout.strip()), + stderr=False, console=True) except: log.warn("Writing keys to the system console failed!") raise -- cgit v1.2.3