xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py

Browse source 
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c

Former-commit-id: 69cd6a1598 [formerly 7e58a73dbf [formerly 8da64048e7] [formerly 69cd6a1598 [formerly cfec08f8c4ac8552699e9387148ba2e9d0dc9558]]]
Former-commit-id: 7e58a73dbf [formerly 8da64048e7]
Former-commit-id: 7e58a73dbf
Former-commit-id: ee8d561f81
This commit is contained in:
Ron Anderson 2014-04-02 18:22:51 -05:00
parent 39ef3a8d1d
commit 23ba3ab089
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cave/com.raytheon.viz.gfe/python/utility/loadConfig.py
View file

@ -26,8 +26,8 @@
#
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 12/11/09 njensen Initial Creation.
#
# 12/11/09 njensen Initial Creation.
# 04/02/2014 #2729 randerso Fixed error handling in loadPreferences
#
#
@ -38,18 +38,23 @@ from java.lang import String, Float, Integer, Boolean
def loadPreferences(config):
try:
# import the config file
if type(config) is types.StringType:
globals = loadConfig(config)
elif type(config) is types.ModuleType:
globals = getGlobals(config)
if type(config) is types.StringType:
configName = config
mod = __import__(config)
elif type(config) is types.ModuleType:
configName = config.__name__
mod = config
globals = getGlobals(mod)
from com.raytheon.viz.gfe import Activator, PythonPreferenceStore
prefs = PythonPreferenceStore(globals)
Activator.getDefault().setPreferenceStore(prefs)
return prefs
except Exception, e:
LogStream.logProblem("Unknown or improper config file: ",
configFile, " for user: ", userName)
import LogStream
import traceback
LogStream.logProblem("Unknown or invalid config file: %s\n%s" % (configName, traceback.format_exc()))
raise Exception, e