From 2da45f9abe35c35c02c692d921bae60f8d0236af Mon Sep 17 00:00:00 2001
From: Donald Johnson <ltdonny@gmail.com>
Date: Thu, 26 May 2011 03:57:57 -0500
Subject: Made main() method for uzbl-event-manager

Calls main() upon running the event manager.  Work done was moving a
gigantic block of repetetive adding for the parser into its own function
`make_parser()`, moved `get_logger(...)` out of the if-main branch, and
declaring a lot of variables as globals (this can be fixed later;
recommended to make all globals in all caps later).

This allows someone to attach a debugger or profiler to the event
manager more easily, just by editing the script.
---
 bin/uzbl-event-manager | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

(limited to 'bin')

diff --git a/bin/uzbl-event-manager b/bin/uzbl-event-manager
index cb462c7..2ba1938 100755
--- a/bin/uzbl-event-manager
+++ b/bin/uzbl-event-manager
@@ -815,8 +815,7 @@ def list_action():
     for plugin in sorted(names.values()):
         print plugin
 
-
-if __name__ == "__main__":
+def make_parser():
     parser = OptionParser('usage: %prog [options] {start|stop|restart|list}')
     add = parser.add_option
 
@@ -862,6 +861,29 @@ if __name__ == "__main__":
         dest='print_events', action="store_false", default=True,
         help="silence the printing of events to stdout")
 
+    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 main():
+    global opts
+    global args
+    global logger
+    global ch
+    global fh
+    global log_level
+
+    parser = make_parser()
+
     (opts, args) = parser.parse_args()
 
     opts.server_socket = expandpath(opts.server_socket)
@@ -897,16 +919,6 @@ if __name__ == "__main__":
 
     # logging.getLogger wrapper which sets the levels and adds the
     # file and console handlers automagically
-    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
-
     # Get main logger
     logger = get_logger(SCRIPTNAME)
     logger.info('logging to %r' % opts.log_file)
@@ -988,4 +1000,9 @@ if __name__ == "__main__":
 
     logger.debug('process CPU time: %f' % time.clock())
 
+
+if __name__ == "__main__":
+    main()
+
+
 # vi: set et ts=4:
-- 
cgit v1.2.3