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

Proposed by Wren Turkal
Status: Merged
Merge reported by: Serge Hallyn
Merged at revision: not available
Proposed branch: lp:~wt-penguintechs-org/vmbuilder/vmbuilder_improve_debug_logs
Merge into: lp:vmbuilder
Prerequisite: lp:~wt-penguintechs-org/vmbuilder/vmbuilder_add_debug_logs
Diff against target: 32 lines (+10/-6)
1 file modified
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+152058@code.launchpad.net

This proposal supersedes a proposal from 2013-03-06.

Commit message

Improve log messages.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VMBuilder/util.py'
2--- VMBuilder/util.py 2010-06-10 17:20:58 +0000
3+++ VMBuilder/util.py 2013-03-06 21:25:25 +0000
4@@ -155,18 +155,22 @@
5 logging.debug('(args=%r, kwargs=%r)' % (args, kwargs))
6 for plugin in context.plugins:
7 logging.debug('Calling %s method in %s plugin.' % (func, plugin.__module__))
8- getattr(plugin, func, log_no_such_method)(*args, **kwargs)
9+ try:
10+ getattr(plugin, func)(*args, **kwargs)
11+ except AttributeError as e:
12+ logging.debug('No such method ({}) in context plugin ({})'.format(
13+ func, plugin.__module__))
14
15 for f in context.hooks.get(func, []):
16 logging.debug('Calling %r.' % (f,))
17 f(*args, **kwargs)
18
19 logging.debug('Calling %s method in context plugin %s.' % (func, context.__module__))
20- getattr(context, func, log_no_such_method)(*args, **kwargs)
21-
22-def log_no_such_method(*args, **kwargs):
23- logging.debug('No such method')
24- return
25+ try:
26+ getattr(context, func)(*args, **kwargs)
27+ except AttributeError as e:
28+ logging.debug('No such method ({}) in context plugin ({})'.format(
29+ func, plugin.__module__))
30
31 def tmp_filename(suffix='', tmp_root=None):
32 # There is a risk in using tempfile.mktemp(): it's not recommended

Subscribers

People subscribed via source and target branches