Additional work to match things to my build structure

[nqaap] / src / nqaap.py

diff --git a/src/nqaap.py b/src/nqaap.py
index ab32ba2..296d7d8 100755 (executable)
--- a/src/nqaap.py
+++ b/src/nqaap.py
@@ -1,28 +1,30 @@
 #!/usr/bin/env python
 
 import os
+import sys
 import logging
 
-import constants
-import nqaap_gtk
-
 
 _moduleLogger = logging.getLogger(__name__)
+sys.path.append("/opt/dialcentral/lib")
+
+
+import constants
+import nqaap_gtk
 
 
-try:
-       os.makedirs(constants._data_path_)
-except OSError, e:
-       if e.errno != 17:
-               raise
+if __name__ == "__main__":
+       try:
+               os.makedirs(constants._data_path_)
+       except OSError, e:
+               if e.errno != 17:
+                       raise
 
-logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_)
-_moduleLogger.info("%s %s-%s" % (constants.__pretty_app_name__, constants.__version__, constants.__build__))
-_moduleLogger.info("OS: %s" % (os.uname()[0], ))
-_moduleLogger.info("Kernel: %s (%s) for %s" % os.uname()[2:])
-_moduleLogger.info("Hostname: %s" % os.uname()[1])
+       logFormat = '(%(relativeCreated)5d) %(levelname)-5s %(threadName)s.%(name)s.%(funcName)s: %(message)s'
+       logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_, format=logFormat)
+       _moduleLogger.info("%s %s-%s" % (constants.__pretty_app_name__, constants.__version__, constants.__build__))
+       _moduleLogger.info("OS: %s" % (os.uname()[0], ))
+       _moduleLogger.info("Kernel: %s (%s) for %s" % os.uname()[2:])
+       _moduleLogger.info("Hostname: %s" % os.uname()[1])
 
-try:
        nqaap_gtk.run()
-finally:
-       logging.shutdown()