diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-01-17 14:41:29 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-01-17 14:41:29 -0500 |
| commit | 15e3241ba725a21604e0f3570e755a91b5edba00 (patch) | |
| tree | d84be61c3a56ddc03eb927d5de5433afacadf64b /cloudinit/CloudConfig/cc_rsyslog.py | |
| parent | 2f7227c7092ad873757167f62c2a82fb4ee69472 (diff) | |
| download | vyos-cloud-init-15e3241ba725a21604e0f3570e755a91b5edba00.tar.gz vyos-cloud-init-15e3241ba725a21604e0f3570e755a91b5edba00.zip | |
[PATCH] PEP8 coding style fixes.
From: Juerg Haefliger <juerg.haefliger@hp.com>
This pulls in the named patch for LP: #914739 with a few other changes.
Diffstat (limited to 'cloudinit/CloudConfig/cc_rsyslog.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_rsyslog.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cloudinit/CloudConfig/cc_rsyslog.py b/cloudinit/CloudConfig/cc_rsyslog.py index e5f38c36..552597a5 100644 --- a/cloudinit/CloudConfig/cc_rsyslog.py +++ b/cloudinit/CloudConfig/cc_rsyslog.py @@ -24,6 +24,7 @@ import traceback DEF_FILENAME = "20-cloud-config.conf" DEF_DIR = "/etc/rsyslog.d" + def handle(_name, cfg, _cloud, log, _args): # rsyslog: # - "*.* @@192.158.1.1" @@ -39,8 +40,8 @@ def handle(_name, cfg, _cloud, log, _args): def_dir = cfg.get('rsyslog_dir', DEF_DIR) def_fname = cfg.get('rsyslog_filename', DEF_FILENAME) - files = [ ] - elst = [ ] + files = [] + elst = [] for ent in cfg['rsyslog']: if isinstance(ent, dict): if not "content" in ent: @@ -70,7 +71,7 @@ def handle(_name, cfg, _cloud, log, _args): # need to restart syslogd restarted = False try: - # if this config module is running at cloud-init time + # if this config module is running at cloud-init time # (before rsyslog is running) we don't actually have to # restart syslog. # @@ -84,7 +85,7 @@ def handle(_name, cfg, _cloud, log, _args): except Exception as e: elst.append(("restart", str(e))) - + if restarted: # this only needs to run if we *actually* restarted # syslog above. |