[meld] Move logging initialisation into launcher

[Kai Willadsen <kaiw src gnome org>]

commit d5b8a36990df533a3e6d086e7c4064c2cb436741
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Oct 7 11:58:13 2013 +1000

    Move logging initialisation into launcher

 bin/meld        |   19 +++++++++++++++++++
 meld/meldapp.py |   18 ------------------
 2 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index c3a2b0f..aaf42b4 100755
--- a/bin/meld
+++ b/bin/meld
@@ -18,6 +18,7 @@
 ### USA.
 
 import locale
+import logging
 import os
 import sys
 
@@ -57,6 +58,7 @@ uninstalled = False
 if os.path.exists(os.path.join(melddir, "meld.doap")):
     sys.path[0:0] = [melddir]
     uninstalled = True
+devel = os.path.exists(os.path.join(melddir, ".git"))
 
 import meld.conf
 
@@ -140,7 +142,24 @@ def setup_resources():
     Gtk.rc_parse(rc_file)
 
 
+def setup_logging():
+    log = logging.getLogger()
+
+    # If we're running uninstalled and from Git, turn up the logging level
+    if uninstalled and devel:
+        log.setLevel(logging.INFO)
+    else:
+        log.setLevel(logging.CRITICAL)
+
+    handler = logging.StreamHandler()
+    formatter = logging.Formatter("%(asctime)s %(levelname)s "
+                                  "%(name)s: %(message)s")
+    handler.setFormatter(formatter)
+    log.addHandler(handler)
+
+
 if __name__ == '__main__':
+    setup_logging()
     disable_stdout_buffering()
     check_requirements()
     setup_resources()
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 43e22e0..fc6aed7 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -18,7 +18,6 @@
 
 from __future__ import print_function
 
-import logging
 import optparse
 import os
 import sys
@@ -230,23 +229,6 @@ class MeldApp(Gtk.Application):
 
         return new_window
 
-
-log = logging.getLogger("meld")
-
-# If we're running uninstalled and from Git, turn up the logging level
-top_level = os.path.dirname(os.path.dirname(__file__))
-if os.path.exists(os.path.join(top_level, "meld.doap")) and \
-   os.path.exists(os.path.join(top_level, ".git")):
-    log.setLevel(logging.WARNING)
-else:
-    log.setLevel(logging.CRITICAL)
-
-handler = logging.StreamHandler()
-formatter = logging.Formatter("%(asctime)s %(levelname)s "
-                              "%(name)s: %(message)s")
-handler.setFormatter(formatter)
-log.addHandler(handler)
-
 app = MeldApp()
 dbus_app = None