diff options
author | Doug Hellmann <doug@doughellmann.com> | 2014-07-25 09:44:10 -0400 |
---|---|---|
committer | Doug Hellmann <doug@doughellmann.com> | 2014-07-25 09:44:10 -0400 |
commit | 6bb694439eae235a9e4b88361863f6dee60852ac (patch) | |
tree | b2464afaa3bc883429594b9785ea60aabb93afc6 | |
parent | 8b3de5492264604f141861eb2883f5fbcef6b4cc (diff) | |
download | cliff-6bb694439eae235a9e4b88361863f6dee60852ac.tar.gz |
Set the main logger name to match the application
Change the main logger to use the application's name instead of
'cliff.app' so that unhandled errors reported as oneliners come out as
"ERROR: myapp some problem happened" instead of
"ERROR: cliff.app some problem happened".
Change-Id: I7d31cb8c1700984e6bd951ee05817b2e6a915da4
Closes-bug: #1348648
-rw-r--r-- | cliff/app.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/cliff/app.py b/cliff/app.py index 4a93801..c2c8f50 100644 --- a/cliff/app.py +++ b/cliff/app.py @@ -33,9 +33,6 @@ else: logging.getLogger('cliff').addHandler(NullHandler()) -LOG = logging.getLogger(__name__) - - class App(object): """Application base class. @@ -57,6 +54,7 @@ class App(object): """ NAME = os.path.splitext(os.path.basename(sys.argv[0]))[0] + LOG = logging.getLogger(NAME) CONSOLE_MESSAGE_FORMAT = '%(message)s' LOG_FILE_MESSAGE_FORMAT = \ @@ -205,10 +203,10 @@ class App(object): else: debug = True if debug: - LOG.exception(err) + self.LOG.exception(err) raise else: - LOG.error(err) + self.LOG.error(err) return 1 result = 1 if self.interactive_mode: @@ -265,7 +263,7 @@ class App(object): if self.options.debug: raise else: - LOG.error(err) + self.LOG.error(err) return 2 cmd_factory, cmd_name, sub_argv = subcommand cmd = cmd_factory(self, self.options) @@ -282,16 +280,16 @@ class App(object): result = cmd.run(parsed_args) except Exception as err: if self.options.debug: - LOG.exception(err) + self.LOG.exception(err) else: - LOG.error(err) + self.LOG.error(err) try: self.clean_up(cmd, result, err) except Exception as err2: if self.options.debug: - LOG.exception(err2) + self.LOG.exception(err2) else: - LOG.error('Could not clean up: %s', err2) + self.LOG.error('Could not clean up: %s', err2) if self.options.debug: raise else: @@ -299,7 +297,7 @@ class App(object): self.clean_up(cmd, result, None) except Exception as err3: if self.options.debug: - LOG.exception(err3) + self.LOG.exception(err3) else: - LOG.error('Could not clean up: %s', err3) + self.LOG.error('Could not clean up: %s', err3) return result |