Trying to better optimize the programmer calculator

[ejpi] / src / ejpi.py

diff --git a/src/ejpi.py b/src/ejpi.py
index 403cca1..2a4d905 100755 (executable)
--- a/src/ejpi.py
+++ b/src/ejpi.py
@@ -1,29 +1,30 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import os
 import sys
 import logging
 
 
-_moduleLogger = logging.getLogger("dialcentral")
-sys.path.append("/usr/lib/ejpi/")
+_moduleLogger = logging.getLogger(__name__)
+sys.path.append("/opt/ejpi/lib")
 
 
 import constants
-import ejpi_glade
+import ejpi_qt
 
 
-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("ejpi %s-%s" % (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 = '(%(asctime)s) %(levelname)-5s %(threadName)s.%(name)s: %(message)s'
+       logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_, format=logFormat)
+       _moduleLogger.info("%s %s-%s" % (constants.__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])
 
-
-ejpi_glade.run_calculator()
+       ejpi_qt.run()