← Back to branch summary

~smoser/ubuntu/utopic/cloud-init/sysvinit

« back to all changes in this revision

Viewing changes to cloudinit/stages.py

  • Committer: Scott Moser
  • Date: 2014-07-24 14:45:29 UTC
  • mfrom: (1.4.19)
  • Revision ID: smoser@ubuntu.com-20140724144529-12uutq0wz1vlfjw0
https://launchpad.net/bugs/1219223
* New upstream snapshot.
  * less noisy logs
  * allow usage of jinja2 templates (LP: #1219223)
  * test case cleanups
  * change build system to be dh and pybuild

Show diffs side-by-side

added added

removed removed

Lines of Context:
cloudinit/stages.py
397
397
                    mod = handlers.fixup_handler(mod)
398
398
                    types = c_handlers.register(mod)
399
399
                    if types:
400
 
                        LOG.debug("Added custom handler for %s from %s",
401
 
                                  types, fname)
 
400
                        LOG.debug("Added custom handler for %s [%s] from %s",
 
401
                                  types, mod, fname)
402
402
                except Exception:
403
403
                    util.logexc(LOG, "Failed to register handler from %s",
404
404
                                fname)
644
644
                    freq = mod.frequency
645
645
                if not freq in FREQUENCIES:
646
646
                    freq = PER_INSTANCE
 
647
                LOG.debug("Running module %s (%s) with frequency %s",
 
648
                          name, mod, freq)
647
649
 
648
650
                # Use the configs logger and not our own
649
651
                # TODO(harlowja): possibly check the module
657
659
                run_name = "config-%s" % (name)
658
660
                cc.run(run_name, mod.handle, func_args, freq=freq)
659
661
            except Exception as e:
660
 
                util.logexc(LOG, "Running %s (%s) failed", name, mod)
 
662
                util.logexc(LOG, "Running module %s (%s) failed", name, mod)
661
663
                failures.append((name, e))
662
664
        return (which_ran, failures)
663
665