VMBuilder

Merge lp:~wt-penguintechs-org/vmbuilder/vmbuilder_improve_debug_logs into lp:vmbuilder

  1. vmbuilder_improve_debug_logs
  2. Merge into 0.12
Proposed by Wren Turkal
Status: Superseded
Proposed branch: lp:~wt-penguintechs-org/vmbuilder/vmbuilder_improve_debug_logs
Merge into: lp:vmbuilder
Diff against target: 49 lines (+13/-6)
2 files modified
VMBuilder/contrib/cli.py (+3/-0)
VMBuilder/util.py (+10/-6)
To merge this branch: bzr merge lp:~wt-penguintechs-org/vmbuilder/vmbuilder_improve_debug_logs
Reviewer Review Type Date Requested Status
VMBuilder Pending
Review via email: mp+152057@code.launchpad.net

This proposal has been superseded by a proposal from 2013-03-06.

Commit message

Improve logging.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VMBuilder/contrib/cli.py'
2--- VMBuilder/contrib/cli.py 2012-11-23 11:06:06 +0000
3+++ VMBuilder/contrib/cli.py 2013-03-06 21:22:23 +0000
4@@ -153,9 +153,12 @@
5 if os.geteuid() != 0:
6 raise VMBuilderUserError('Must run as root')
7
8+ logging.debug("Launch directory: {}".format(os.getcwd()))
9+
10 distro.overwrite = hypervisor.overwrite = self.options.overwrite
11 destdir = self.options.destdir or ('%s-%s' % (distro.arg,
12 hypervisor.arg))
13+ logging.debug("Output destdir: {}".format(destdir))
14
15 if self.options.tmpfs and self.options.chroot_dir:
16 raise VMBuilderUserError('--chroot-dir and --tmpfs can not be used together.')
17
18=== modified file 'VMBuilder/util.py'
19--- VMBuilder/util.py 2010-06-10 17:20:58 +0000
20+++ VMBuilder/util.py 2013-03-06 21:22:23 +0000
21@@ -155,18 +155,22 @@
22 logging.debug('(args=%r, kwargs=%r)' % (args, kwargs))
23 for plugin in context.plugins:
24 logging.debug('Calling %s method in %s plugin.' % (func, plugin.__module__))
25- getattr(plugin, func, log_no_such_method)(*args, **kwargs)
26+ try:
27+ getattr(plugin, func)(*args, **kwargs)
28+ except AttributeError as e:
29+ logging.debug('No such method ({}) in context plugin ({})'.format(
30+ func, plugin.__module__))
31
32 for f in context.hooks.get(func, []):
33 logging.debug('Calling %r.' % (f,))
34 f(*args, **kwargs)
35
36 logging.debug('Calling %s method in context plugin %s.' % (func, context.__module__))
37- getattr(context, func, log_no_such_method)(*args, **kwargs)
38-
39-def log_no_such_method(*args, **kwargs):
40- logging.debug('No such method')
41- return
42+ try:
43+ getattr(context, func)(*args, **kwargs)
44+ except AttributeError as e:
45+ logging.debug('No such method ({}) in context plugin ({})'.format(
46+ func, plugin.__module__))
47
48 def tmp_filename(suffix='', tmp_root=None):
49 # There is a risk in using tempfile.mktemp(): it's not recommended

Subscribers

People subscribed via source and target branches