Merge lp:~tony-badwolf/quickly/quicklyloggingupdate into lp:quickly

[Tony Byrne]

documents logging usage within code comments
restores original logging command line usage -d debug
all modules use same logger because some lib modules report on glade signals and preferences mismatches
default to logging level debug while project runs within quickly

Unmerged revisions

643. By Tony Byrne <email address hidden> <email address hidden> on 2011-12-04

A more sensible default
Turn on logging while project runs inside quickly

642. By Tony Byrne <email address hidden> <email address hidden> on 2011-12-04

restores original "API" for logging
default logging.ERROR
-v logging.WARNING
-vv logging.INFO
-vvv logging.DEBUG
-d logging.DEBUG
fixes https://bugs.launchpad.net/quickly/+bug/882842

documents logging usage in __init__.py
addresses https://answers.launchpad.net/quickly/+question/176340

641. By Tony Byrne <email address hidden> <email address hidden> on 2011-12-04

don't hide logging messages from python_name_lib

640. By Didier Roche-Tolomelli on 2011-12-02

Merge David's fix for fixing signal autoconnect does not work with
signal names which contain hypens (LP: #890318). Thanks!

639. By Michael Terry on 2011-11-08

fix tests to pass with latest platform and quickly changes

=== modified file 'data/templates/ubuntu-application/create.py'
--- data/templates/ubuntu-application/create.py	2011-06-06 10:14:40 +0000
+++ data/templates/ubuntu-application/create.py	2011-12-05 00:02:27 +0000
@@ -110,7 +110,7 @@
 # run the new application if X display
 if templatetools.is_X_display() and os.path.isfile(exec_file):
     print _("Launching your newly created project!")
-    subprocess.call(['./' + project_name], cwd='bin/')
+    subprocess.call(['./' + project_name, '-d'], cwd='bin/')
 
 bzr_instance.wait()
 

=== modified file 'data/templates/ubuntu-application/project_root/python/__init__.py'
--- data/templates/ubuntu-application/project_root/python/__init__.py	2011-03-31 15:19:55 +0000
+++ data/templates/ubuntu-application/project_root/python/__init__.py	2011-12-05 00:02:27 +0000
@@ -18,11 +18,24 @@
 def parse_options():
     """Support for command line options"""
     parser = optparse.OptionParser(version="%%prog %s" % get_version())
-    parser.add_option(
-        "-v", "--verbose", action="count", dest="verbose",
-        help=_("Show debug messages (-vv debugs python_name_lib also)"))
+    
+    parser.add_option('-d', '--debug', dest='debug_mode', action='store_true',
+        help=_('Print the maximum debugging info (implies -vv)'))
+    parser.add_option('-v', '--verbose', dest='logging_level', action='count',
+        help=_('set error_level output to warning, info, and then debug'))
+
+    ERROR, WARNING, INFO, DEBUG = range(4)
+    parser.set_defaults(logging_level=ERROR)
+
     (options, args) = parser.parse_args()
 
+    # set the verbosity
+    if options.debug_mode:
+        options.logging_level = DEBUG
+
+    if options.logging_level > DEBUG:
+        options.logging_level = DEBUG
+
     set_up_logging(options)
 
 def main():

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/Builder.py'
--- data/templates/ubuntu-application/project_root/python_lib/Builder.py	2011-11-14 17:14:44 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/Builder.py	2011-12-05 00:02:27 +0000
@@ -11,7 +11,7 @@
 import inspect
 import functools
 import logging
-logger = logging.getLogger('python_name_lib')
+logger = logging.getLogger('python_name')
 
 from xml.etree.cElementTree import ElementTree
 

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/PreferencesDialog.py'
--- data/templates/ubuntu-application/project_root/python_lib/PreferencesDialog.py	2011-03-31 17:05:41 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/PreferencesDialog.py	2011-12-05 00:02:27 +0000
@@ -14,7 +14,7 @@
 
 import gtk
 import logging
-logger = logging.getLogger('python_name_lib')
+logger = logging.getLogger('python_name')
 
 from . helpers import get_builder, show_uri, get_help_uri
 from . preferences import preferences

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/Window.py'
--- data/templates/ubuntu-application/project_root/python_lib/Window.py	2011-04-04 14:28:36 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/Window.py	2011-12-05 00:02:27 +0000
@@ -5,7 +5,7 @@
 
 import gtk
 import logging
-logger = logging.getLogger('python_name_lib')
+logger = logging.getLogger('python_name')
 
 from . helpers import get_builder, show_uri, get_help_uri
 from . preferences import preferences

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/helpers.py'
--- data/templates/ubuntu-application/project_root/python_lib/helpers.py	2011-03-31 17:05:41 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/helpers.py	2011-12-05 00:02:27 +0000
@@ -46,6 +46,12 @@
     def emit(self, record):
         pass
 
+LEVELS = (  logging.ERROR,
+            logging.WARNING,
+            logging.INFO,
+            logging.DEBUG,
+            )
+
 def set_up_logging(opts):
     # add a handler to prevent basicConfig
     root = logging.getLogger()
@@ -59,17 +65,9 @@
     logger_sh.setFormatter(formatter)
     logger.addHandler(logger_sh)
 
-    lib_logger = logging.getLogger('python_name_lib')
-    lib_logger_sh = logging.StreamHandler()
-    lib_logger_sh.setFormatter(formatter)
-    lib_logger.addHandler(lib_logger_sh)
-
     # Set the logging level to show debug messages.
-    if opts.verbose:
-        logger.setLevel(logging.DEBUG)
-        logger.debug('logging enabled')
-    if opts.verbose > 1:
-        lib_logger.setLevel(logging.DEBUG)
+    logger.setLevel(LEVELS[opts.logging_level])
+    logger.debug('logging enabled')
 
 def get_help_uri(page=None):
     # help_uri from source tree - default language

=== modified file 'data/templates/ubuntu-application/run.py'
--- data/templates/ubuntu-application/run.py	2011-07-22 10:47:34 +0000
+++ data/templates/ubuntu-application/run.py	2011-12-05 00:02:27 +0000
@@ -54,6 +54,20 @@
 command_line = [project_bin]
 command_line.extend([arg for arg in sys.argv[1:] if arg != "--"])
 
+# outside quickly log defaults to error
+# and can be set to warning, info or debug
+# inside quickly log defaults to debug
+# and can be set to warning, info or debug
+
+LOGGING = False
+for opt in command_line[1:]:
+    if opt  == '-d' or opt.startswith('-v'):
+        LOGGING = True
+
+if not LOGGING:
+    print 'automatic debug logging while running from quickly'
+    command_line.extend('-d')
+
 # run with args if bin/project exist
 st = os.stat(project_bin)
 mode = st[stat.ST_MODE]