Skip to content

Error Logging to a file #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ setup/Output/setup.exe

#folders
Temp

*.app
*.spec

Expand Down
17 changes: 11 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,12 @@ addons:
- wx2.8-headers
- wx2.8-i18n

# mariadb: '10.1'
before_script:
- ./scripts/tests/mysql_setup.sh
- ./scripts/tests/postgres_setup.sh
- ./scripts/tests/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
Expand All @@ -60,8 +56,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

4 changes: 2 additions & 2 deletions ODMTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion odmtools/common/icons/icons4addpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,3 @@
"fyFkZ8W5EwnwX4WlCUrEwmMFZkmMQPAcCJtVkoD4EMZKSAS83/OIZpUkIGkyMR0zSkDa4aQd"
"M1ogpsNJJKIFttbvuQ/ulVA1tikCBXDWEsImM5JQa894HkhCT0SFKtQK4I8S8HPlTrhEwEhE"
"JgM+pRN1vhJAqemmBC4LChiWfQsq9brIX7OZ6v/BfANr87/zITFiXQAAAABJRU5ErkJggg==")

2 changes: 1 addition & 1 deletion odmtools/common/icons/img2py.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from wx.tools import img2py

output = 'icons4addpoint.py'
output = 'test_icons.py'

# get the list of BMP files
#files = [f for f in os.listdir('.') if re.search(r'odm\d*x\d*\.png', f)]
Expand Down
86 changes: 75 additions & 11 deletions odmtools/common/icons/plotToolbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
"CsZqSyMGTTeLOYWm1zaUxPzXpURydi7x7fvSwtupGScWi13keX6xIsHszPP3bkmgmZX1RPJz"
"KpFaSCefPpvcxjH6D2k3O6c42VTiAAAAAElFTkSuQmCC")


#----------------------------------------------------------------------
zoom_to_rect = PyEmbeddedImage(
"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBj"
Expand Down Expand Up @@ -176,17 +177,80 @@
"t7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxSfNTws+7PbaOWo6fH"
"XMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+tfa5zvMf"
"fnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/"
"6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAAABp0RVh0U29m"
"dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAB3ElEQVQ4T5WTbU/aUBTH+VjEfQPdZxDZ"
"+/p68GZB4hIVNAV1T7plU5z4EETdEqYmGoeOvRgzQZ2FTJfJ1irIQ4XWIvx3z00g1qqZJ/kn"
"t/9z7u+etvfYcCUMw8Dq+gZejr3mWmNr8u4KWzP5eWsbnn4fPiW+InWc5Yptf+HeJsvdFhyw"
"Gd/C2PswJFnBr3wefwpFpJUT/kx6FZrmNTeFTdM09PoGcXiaQ8/TfkyEwiaRRznvgB9Uez1s"
"sZVVxJPf8bdYgl98jtSPnyaRd3xWQPxbErGVNSsgEByBzDYXKhUEn43j6LdsEnlKqcwOKCIw"
"PGoFiIFh5NRzlFh7L8bfIndWMom8/HkFp2UVIjvM8gpLHz5iZ28fZU3Hm3dT0C8Mk8ijXDK1"
"i2VWawHIsgzfkAjNqN36ESnX5xsC1VoAtVoNkYUoItFFXNbrN2o+EoXD+QhiIIhGo2Fi8Hug"
"qipm5+bhZ51IUhp1VlRnsIMDCf5BET3eXrS1PYDL5WJymyCtm1itVtlmCZOhKTzxeLloTZ6i"
"KHB0OWG32+F2u/H4CqQFoE6oPV3XQTASrckjZbNZdDq6LBAT4K6huQ4RBAHT4Rn8N6DZIXUi"
"CN1o73iIBBu8ewGaEPqdmUyGz8Y/d/qJcLWhfigAAAAASUVORK5CYII=")
"6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAABp0RVh0U29m"
"dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAABpUlEQVQ4T52Q20oCURSGeyyxN6ieIbP7"
"6Tq9CZWCTJPRzmnRQSsqzE5gKhSmVhdZYKcJOpDVWJqHEsvSv70HLMeZCrr4Nmuv9a9vD1MH"
"QIR/cwsj9jGBAKlr57V8FdvhCHRGEzZ29xCL3wp4IztCL0hmlVwtwhEMhWGfmQPHJ3CdSuEu"
"ncF54kG4U0ads6CZ6sUKwtFp6sXlYxL6LiOmnHMiaI/ODD1mEpUReH1+hKIHuM9kYWaHEDu9"
"EEF78ac0QvtReH0BslMjsNr6wZPldD4P26ADVze8CNpLZHPkgQysfQNSAWvtQ/L5BdlCAcOO"
"CSSfsiJoL/WSx2PuGSx5TCJYWVvH4fEJcoVXjE+68PpWFEF7dBaNHWGVZCUCnudhsrAoFN9/"
"/Il01m2ySJYpwuFe8sDtWcZHqSTLotsDlboVrNVG4jICyvzCIszkSzjuHKVyGSWyeHbGwdzL"
"Qm/ohFJZD41GQ9CSuIyAwnEcpp0udOgMArSuzFQtaigUCmi1WrRXSUSCv2hWtUgkssHfqEgY"
"hiHXfwgoDNOGhsYmUv5T8A3qPgH1xhJNvEHJKAAAAABJRU5ErkJggg==")


# PyEmbeddedImage(
# "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBj"
# "SFJNAACHDwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3No"
# "b3AgSUNDIHByb2ZpbGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0"
# "sSGiAhFFRJoiSFDEgNFQJFZEsRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3P"
# "WhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTsAIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6"
# "WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4JUuQLrbPipgalyxmGCVmvihBEcuJOWGR"
# "DT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR3xKxRoowlSviN+LYVA4zAwAU"
# "SWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQdli7d1NqaQffkZKVw"
# "BALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtFehn4uWcQ"
# "rf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX"
# "wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGc"
# "eA6fwxNFhImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR"
# "+8Vd/6NvvvgwIH554SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd"
# "6ABDYAasgC1wBG7AG/iDEBAJVgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL"
# "4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50Gao"
# "GCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyCqbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+Ad"
# "cCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiEj6xHipAKpAFpRbqRPuQmMorM"
# "IG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I1kfboL3QEegEdBa6"
# "EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9rB3WH8vE"
# "CrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG"
# "fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemR"
# "XEjRJCFpB+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSRe"
# "UlPSSXK1ZK5kheQJyeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJa"
# "Mm4ybJkCmYMyF2TGKQhFneJCYVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sie"
# "lh2lITQtmhcthVZKO04bpr1borTEaQlnyfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bf"
# "Jd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48vvacIK+opBimuVTyo2K84p6Ss5KGUrlSl"
# "dEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0CvpvfRZVUVVT1Whar3qgOqCmrZa"
# "qFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15LWytca6tWp9aUtpy2"
# "l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AAbWBtwDNo"
# "MBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z"
# "llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQw"
# "ShiXrdHWztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/aj"
# "DqoOTIcGh8eO6o5sxybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P"
# "3NXcE9xb3Gc9LDzWepzzRHv6eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7e"
# "frv9HqzQXMFb0ekP/L38d/s/DNAOWBPwYyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuh"
# "OqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmRXVHYqLCopqi5lW4r96yciLaILoweXqW9"
# "KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNmWS6svaxnbEd2OXuaY8cp40zG"
# "28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wlxqae5Mnwknm9acpp"
# "2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2dDYvuz9H"
# "L2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8"
# "V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN"
# "6TeV33zaEb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7"
# "Ryt9K7uqNKp2Vr2vTqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiI"
# "OZh58EljWGPft4xvm5sUmoqbPhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWyt"
# "b6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+"
# "o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h/HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9"
# "Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavrXTesb3QPLh88M+QwdP6m681L"
# "t7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxSfNTws+7PbaOWo6fH"
# "XMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+tfa5zvMf"
# "fnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/"
# "6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAAABp0RVh0U29m"
# "dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAB3ElEQVQ4T5WTbU/aUBTH+VjEfQPdZxDZ"
# "+/p68GZB4hIVNAV1T7plU5z4EETdEqYmGoeOvRgzQZ2FTJfJ1irIQ4XWIvx3z00g1qqZJ/kn"
# "t/9z7u+etvfYcCUMw8Dq+gZejr3mWmNr8u4KWzP5eWsbnn4fPiW+InWc5Yptf+HeJsvdFhyw"
# "Gd/C2PswJFnBr3wefwpFpJUT/kx6FZrmNTeFTdM09PoGcXiaQ8/TfkyEwiaRRznvgB9Uez1s"
# "sZVVxJPf8bdYgl98jtSPnyaRd3xWQPxbErGVNSsgEByBzDYXKhUEn43j6LdsEnlKqcwOKCIw"
# "PGoFiIFh5NRzlFh7L8bfIndWMom8/HkFp2UVIjvM8gpLHz5iZ28fZU3Hm3dT0C8Mk8ijXDK1"
# "i2VWawHIsgzfkAjNqN36ESnX5xsC1VoAtVoNkYUoItFFXNbrN2o+EoXD+QhiIIhGo2Fi8Hug"
# "qipm5+bhZ51IUhp1VlRnsIMDCf5BET3eXrS1PYDL5WJymyCtm1itVtlmCZOhKTzxeLloTZ6i"
# "KHB0OWG32+F2u/H4CqQFoE6oPV3XQTASrckjZbNZdDq6LBAT4K6huQ4RBAHT4Rn8N6DZIXUi"
# "CN1o73iIBBu8ewGaEPqdmUyGz8Y/d/qJcLWhfigAAAAASUVORK5CYII=")

#----------------------------------------------------------------------
scroll_left = PyEmbeddedImage(
Expand Down
26 changes: 14 additions & 12 deletions odmtools/common/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions odmtools/common/taskServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
3 changes: 3 additions & 0 deletions odmtools/controller/frmAddPoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down
25 changes: 15 additions & 10 deletions odmtools/controller/frmBulkInsert.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
from pandas.parser import CParserError
import csv
import StringIO

import logging
logger =logging.getLogger('main')
__author__ = 'Jacob'


Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions odmtools/controller/frmDBConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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


Expand Down
7 changes: 3 additions & 4 deletions odmtools/controller/frmDataFilters.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
from odmtools.common.logger import LoggerTool
from odmtools.view import clsDataFilters

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')



Expand Down
2 changes: 1 addition & 1 deletion odmtools/controller/frmDataTable.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def onChangeSelection(self, datetime_list=None):
self.olvDataTable.SetItemState(i, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED)
self.olvDataTable.Focus(results[0][0])
self.enableSelectDataTable = False
except:
except Exception as e :
pass
def clear(self):
self.memDB = None
Expand Down
12 changes: 7 additions & 5 deletions odmtools/controller/frmSeriesSelector.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
from odmtools.odmdata import MemoryDatabase
from odmtools.view import clsSeriesSelector

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')

__author__ = 'Jacob'

Expand Down Expand Up @@ -105,7 +106,7 @@ def refreshSeries(self):
self.series_service = self.parent.Parent.createService()
#self.refreshTableSeries(self.dbservice)
self.resetDB(self.series_service)
logger.debug("Repopulate Series Selector")
logger.info("Repopulate Series Selector")

def initSVBoxes(self):
"""
Expand Down Expand Up @@ -366,7 +367,8 @@ def siteAndVariables(self):
self.setFilter(site_code=self.site_code, var_code=self.variable_code)
self.cbVariables.Enabled = True
self.cbSites.Enabled = True
except IndexError:
except IndexError as i:
logger.error(i)
pass

def siteOnly(self):
Expand Down Expand Up @@ -466,7 +468,7 @@ def onReadyToPlot(self, event):
logger.debug("Obtain object")
try:
object = event.object
except:
except Exception as e :
object = self.tblSeries.GetSelectedObject()

if not self.tblSeries.IsChecked(object):
Expand Down
6 changes: 3 additions & 3 deletions odmtools/controller/logicEditTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,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 EditTools():
# Script header (imports etc.) will be set up in Main when record is clicked.
Expand Down
Loading