merge logging

Author: stephanie

.gitignore

@@ -63,6 +63,7 @@ setup/Output/setup.exe
 
 #folders
 Temp
+
 *.app
 *.spec
 

.travis.yml

@@ -41,16 +41,19 @@ addons:
       - wx2.8-headers
       - wx2.8-i18n
 
+
 #  mariadb: '10.1'
 before_script:
   - ./ci-helpers/travis/mysql_setup.sh
   - ./ci-helpers/travis/postgres_setup.sh
   - ./ci-helpers/travis/freetds.sh
 
+
 before_install:
 # python -m pip makes the install go into the virtualenv
   - python -m pip install pandas
   - export PYMSSQL_BUILD_WITH_BUNDLED_FREETDS=1;python -m  pip install pymssql
+
 #  - python -m  pip install mysql-python
 install: # now just our code
   - pip install geoalchemy2
@@ -60,8 +63,17 @@ install: # now just our code
 # don't forget to open up the azure mssql server to these addreses
 # https://docs.travis-ci.com/user/ip-addresses/
 
+#  mariadb: '10.1'
+before_script:
+  - chmod +x ./tests/scripts/mysql_setup.sh
+#  - chmod +x ./tests/scripts/postgres_setup.sh
+  - chmod +x ./tests/scripts/freetds.sh
+  - ./tests/scripts/mysql_setup.sh
+#  - ./tests/scripts/postgres_setup.sh
+  - ./tests/scripts/freetds.sh
+
 # command to run tests
 script:
-
+#  - pythonw -m pytest
   - py.test
 

ODMTools.py

@@ -23,7 +23,7 @@
 import psycopg2
 
 tool = LoggerTool()
-logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
+logger = tool.setupLogger('main',  'odmtools.log', 'a', logging.INFO)
 wx.Log.SetLogLevel(0)
 
 
@@ -67,7 +67,7 @@ def runODM():
     app.MainLoop()
 
 if __name__ == '__main__':
-    logger.debug("Welcome to ODMTools Python. Please wait as system loads")
+    logger.info("Welcome to ODMTools Python. Please wait as system loads")
     # https://docs.python.org/2/library/multiprocessing.html#miscellaneous
 
     # Add support for when a program which uses multiprocessing has been frozen to produce a Windows executable.

ci-helpers/travis/mysql_setup.sh

@@ -21,12 +21,12 @@ mysql -e "create database IF NOT EXISTS odm2test;" --user=root
 #####
 # install
 #####
-ls -al  ./tests/scripts/sampledb/odm_mysql.sql ./tests/scripts/sampledb/odm_postgresql.sql
+ls -al  ./tests/scripts/sampledb/odm_mysql.sql ./tests/scripts/sampledb/odm_postgres.sql
 mysql --user=ODM --password=odm  odm < ./tests/scripts/sampledb/odm_mysql.sql
 mysql --user=root  -e  "show databases;"
 mysql --user=root -e   "GRANT ALL PRIVILEGES ON odm.* TO 'ODM'@'localhost';FLUSH PRIVILEGES;"
 # these should produce results, if they don't the lower_case_table_names failed
 # should make them grep or sed for some keywords
 mysql --user=ODM --password=odm odm -e "use odm; Select * from Variables;"
-mysql --user=ODM --password=odm odm -e "Select * from Variables;"
-mysql --user=ODM --password=odm  -e "Select * from Variables;"
+mysql --user=ODM --password=odm odm -e "use odm; Select * from Variables;"
+mysql --user=ODM --password=odm  -e "use odm; Select * from Variables;"

ci-helpers/travis/postgres_setup.sh

@@ -2,9 +2,9 @@
 psql -U postgres -c "create extension postgis" 
 psql -c 'DROP DATABASE IF EXISTS odmtest;' -U postgres;
 psql -c 'create database odmtest;' -U postgres;
-#psql -U postgres -d odmtest -a -f ./tests/scripts/sampledb/odm_postgresql.sql
+#psql -U postgres -d odmtest -a -f ./tests/scripts/sampledb/odm_postgres.sql
 psql -c 'DROP DATABASE IF EXISTS odm;' -U postgres;
 psql -c 'create database odm;' -U postgres;
   ## install
   # add -a to psql to see full log, -q is quiet
-psql -U postgres -q  -f ./tests/scripts/sampledb/odm_postgresql.sql
+psql -U postgres -q  -f ./tests/scripts/sampledb/odm_postgres.sql

odmtools/common/logger.py

@@ -15,31 +15,33 @@
 class LoggerTool():
     def __init__(self):
         self.formatString = '%(asctime)s - %(levelname)s - %(name)s.%(funcName)s() (%(lineno)d): %(message)s'
-        self.formatString1 = '%(asctime)s (%(levelname)s) %(module)s:%(funcName)s.%(name)s(%(lineno)d) - %(message)s'
+        self.formatString1 = '%(asctime)s (%(levelname)s) %(module)s:%(funcName)s(%(lineno)d) - %(message)s'
+        self.formatString2 ='%(asctime)s - %(levelname)s - %(module)s - %(message)s'
 
     def setupLogger(self, loggerName, logFile, m='w', level=logging.INFO):
         l = logging.getLogger(loggerName)
         # formatter = logging.Formatter('%(asctime)s : %(message)s')
-        formatter = logging.Formatter(self.formatString)
+        formatter = logging.Formatter(self.formatString1)
 
-        #logPath = os.path.abspath(os.path.dirname("../../"))
-        #logPath = util.resource_path("ODMTools")
-        logPath = user_log_dir("ODMTools", "UCHIC")
 
-        #logPath = os.path.join(user_log_dir("ODMTools", "UCHIC"), "log")
-        #print  logPath
+        streamHandler = logging.StreamHandler()
+        streamHandler.setFormatter(formatter)
+
+        l.setLevel(level)
+        #l.setLevel(20) #Set logger to 20 to hide debug statements
+        l.addHandler(streamHandler)
+
 
+
+        logPath = user_log_dir("ODMTools", "UCHIC")
         if not os.path.exists(logPath):
             os.makedirs(logPath, 0755)
         fileHandler = logging.FileHandler(os.path.join(logPath, logFile), mode=m)
         fileHandler.setFormatter(formatter)
-        streamHandler = logging.StreamHandler()
-        streamHandler.setFormatter(formatter)
 
-        l.setLevel(level)
-        #l.setLevel(20) #Set logger to 20 to hide debug statements
+        # l.setLevel(logging.ERROR)
         l.addHandler(fileHandler)
-        l.addHandler(streamHandler)
+
 
         # solves issues where logging would duplicate its logging message to the root logger
         # https://stackoverflow.com/questions/21127360/python-2-7-log-displayed-twice-when-logging-module-is-used-in-two-python-scri

odmtools/common/taskServer.py

@@ -9,8 +9,9 @@
 from odmtools.common.logger import LoggerTool
 
 
-tool = LoggerTool()
-logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
+# tool = LoggerTool()
+# logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
+logger =logging.getLogger('main')
 
 class TaskServerMP:
     """

odmtools/controller/frmAddPoints.py

@@ -7,6 +7,8 @@
     from agw import genericmessagedialog as GMD
 except ImportError:
     import wx.lib.agw.genericmessagedialog as GMD
+import logging
+logger =logging.getLogger('main')
 
 # Implementing AddPoints
 class AddPoints(clsAddPoints.AddPoints):
@@ -79,6 +81,7 @@ def onDeleteBtn(self, event):
             value = msg.ShowModal()
             if value == wx.ID_YES:
                 self.customRemove(self.selectedObject)
+
                 #self.sb.SetStatusText("Removing %s" % self.sb.SetStatusText("Removing %s" % self.selectedObject.dataValue))
 
         self.selectedObject = None

odmtools/controller/frmBulkInsert.py

@@ -8,7 +8,8 @@
 from pandas.parser import CParserError
 import csv
 import StringIO
-
+import logging
+logger =logging.getLogger('main')
 __author__ = 'Jacob'
 
 
@@ -63,12 +64,14 @@ def readDataFromCSV(self, filepath):
                                 8: str.strip,
                                 9: str.strip})
         except CParserError as e:
-
-            msg = wx.MessageDialog(None, "There was an issue trying to parse your file. "
-                                         "Please compare your csv with the template version as the file"
-                                         " you provided "
-                                         "doesn't work: %s" % e, 'Issue with csv', wx.OK | wx.ICON_WARNING |
+            message = "There was an issue trying to parse your file. "\
+                                         "Please compare your csv with the template version as the file"\
+                                         " you provided "\
+                                         "doesn't work: %s" % e
+            msg = wx.MessageDialog(None,message , 'Issue with csv', wx.OK | wx.ICON_WARNING |
                                    wx.OK_DEFAULT)
+
+            logger.info(message)
             value = msg.ShowModal()
             return False
 
@@ -97,11 +100,13 @@ def loadIntoDataFrame(self, data):
 
             except TypeError as e:
                 dlg.Destroy()
-                msg = wx.MessageDialog(None, "There was an issue trying to parse your file. "
-                                             "Please check to see if there could be more columns or"
-                                             " values than"
-                                             " the program expects",
+                message =  "There was an issue trying to parse your file. "\
+                                             "Please check to see if there could be more columns or"\
+                                             " values than"\
+                                             " the program expects"
+                msg = wx.MessageDialog(None, message,
                                        'Issue with csv', wx.OK | wx.ICON_WARNING | wx.OK_DEFAULT)
+                logger.info(message)
                 value = msg.ShowModal()
                 return False
 

odmtools/controller/frmDBConfig.py

@@ -14,8 +14,9 @@
 sys.path.append(directory)
 '''
 
-tool = LoggerTool()
-logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
+# tool = LoggerTool()
+# logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
+logger =logging.getLogger('main')
 
 class frmDBConfig(wx.Dialog):
     def __init__(self, parent, service_manager, is_main=False):
@@ -54,7 +55,7 @@ def OnValueChanged(self, event):
             curr_dict = self.getFieldValues()
             if self.conn_dict == curr_dict:
                 self.btnSave.Enable(True)
-        except:
+        except Exception as e:
             pass