diff options
author | Donald Johnson <ltdonny@gmail.com> | 2011-06-03 17:41:25 -0500 |
---|---|---|
committer | keis <keijser@gmail.com> | 2011-06-04 12:09:56 +0200 |
commit | e48f3ca7de9ff20559506e2bae08fd860a3984b9 (patch) | |
tree | 31e9305395714c217523c20464754a52dacb3b76 /bin | |
parent | 903b5dc708cc2ef424941bc831c63cc937f24dfd (diff) |
Made logging easier
Made init_logger() which sets up the root logger and log level, and then
used `logger` as a global to refer to the script's logger right off the
bat. Removed usage of `get_logger(name)` entirely.
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/uzbl-event-manager | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/bin/uzbl-event-manager b/bin/uzbl-event-manager index 5299a5e..4b3e976 100755 --- a/bin/uzbl-event-manager +++ b/bin/uzbl-event-manager @@ -65,6 +65,8 @@ CACHE_DIR = os.path.join(xdghome('CACHE', '.cache/'), 'uzbl/') # Define some globals. SCRIPTNAME = os.path.basename(sys.argv[0]) +logger = logging.getLogger(SCRIPTNAME) + def get_exc(): '''Format `format_exc` for logging.''' return "\n%s" % format_exc().rstrip() @@ -841,6 +843,7 @@ def list_action(): for plugin in sorted(names.values()): print plugin + def make_parser(): parser = OptionParser('usage: %prog [options] {start|stop|restart|list}') add = parser.add_option @@ -858,6 +861,7 @@ def make_parser(): help='load plugin, loads before plugins in search dirs') socket_location = os.path.join(CACHE_DIR, 'event_daemon') + add('-s', '--server-socket', dest='server_socket', metavar="SOCKET", default=socket_location, help='server AF_UNIX socket location') @@ -889,24 +893,29 @@ def make_parser(): return parser -def get_logger(name): - handlers = [ch, fh] - level = [max(log_level, 10),] - logger = logging.getLogger(name) - logger.setLevel(level[0]) - for handler in handlers: - logger.addHandler(handler) - return logger +def init_logger(): + log_level = logging.CRITICAL - opts.verbose*10 + logger = logging.getLogger() + logger.setLevel(max(log_level, 10)) + # Console + handler = logging.StreamHandler() + handler.setLevel(max(log_level+10, 10)) + handler.setFormatter(logging.Formatter( + '%(name)s: %(levelname)s: %(message)s')) + logger.addHandler(handler) + + # Logfile + handler = logging.FileHandler(opts.log_file, 'w', 'utf-8', 1) + handler.setLevel(max(log_level, 10)) + handler.setFormatter(logging.Formatter( + '[%(created)f] %(name)s: %(levelname)s: %(message)s')) + logger.addHandler(handler) def main(): global opts - global logger - global ch - global fh - global log_level parser = make_parser() @@ -929,24 +938,7 @@ def main(): opts.log_file = expandpath(opts.log_file) # Logging setup - log_level = logging.CRITICAL - opts.verbose*10 - - # Console logging handler - ch = logging.StreamHandler() - ch.setLevel(max(log_level+10, 10)) - ch.setFormatter(logging.Formatter( - '%(name)s: %(levelname)s: %(message)s')) - - # File logging handler - fh = logging.FileHandler(opts.log_file, 'w', 'utf-8', 1) - fh.setLevel(max(log_level, 10)) - fh.setFormatter(logging.Formatter( - '[%(created)f] %(name)s: %(levelname)s: %(message)s')) - - # logging.getLogger wrapper which sets the levels and adds the - # file and console handlers automagically - # Get main logger - logger = get_logger(SCRIPTNAME) + init_logger() logger.info('logging to %r' % opts.log_file) plugins = {} |