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

Issue #3990 Remove multiple smartInit restriction added by DR #3146

Browse source 
Change-Id: I6231da05828bcc76489793c7cf8acd29468b4516

Former-commit-id: 1cd011163c [formerly 6248c878ff] [formerly 03c265fc9f] [formerly 0dab6f4797 [formerly 03c265fc9f [formerly c4ba2394228935c7725688c11b91c3de130d586b]]]
Former-commit-id: 0dab6f4797
Former-commit-id: 1189d29ab168ea07982b041314aa47e5d998adf1 [formerly 4abb7e718b]
Former-commit-id: 6e2c48ea00
This commit is contained in:
Ron Anderson 2015-01-13 11:00:05 -06:00
parent bf944c5137
commit 2785d2a3e4
1 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py
View file

@ -30,8 +30,6 @@
# ------------ ---------- ----------- -------------------------- # ------------ ---------- ----------- --------------------------
# 08/09/2013 #1571 randerso Changed projections to use the Java # 08/09/2013 #1571 randerso Changed projections to use the Java
# ProjectionType enumeration # ProjectionType enumeration
# 07/09/2014 #3146 randerso Added check for duplicate smartInit
# rferrel Corrected log to alertviz.
# #
######################################################################## ########################################################################
import types import types
@ -440,7 +438,7 @@ def otherParse(serverhost, mhsid, port,
"not an int: " + `vtecRequestTime` "not an int: " + `vtecRequestTime`
if type(port) != int: if type(port) != int:
raise TypeError, "GFESUITE_PORT not an int: " + `port` raise TypeError, "GFESUITE_PORT not an int: " + `port`
javainitmodules = dictCheck(initmodules, list, str, "INITMODULES") initmodules = dictCheck(initmodules, list, str, "INITMODULES")
accumElem = dictCheck(accumElem, list, str, "D2DAccumulativeElements") accumElem = dictCheck(accumElem, list, str, "D2DAccumulativeElements")
initskips = dictCheck(initskips, list, int, "INITSKIPS") initskips = dictCheck(initskips, list, int, "INITSKIPS")
d2ddbver = dictCheck(d2ddbver, int, None, "D2DDBVERSIONS") d2ddbver = dictCheck(d2ddbver, int, None, "D2DDBVERSIONS")
@ -509,41 +507,9 @@ def otherParse(serverhost, mhsid, port,
raise TypeError, "TRANSMIT_SCRIPT not None or str: " + `transmitScript` raise TypeError, "TRANSMIT_SCRIPT not None or str: " + `transmitScript`
elif transmitScript is None: elif transmitScript is None:
transmitScript = "" transmitScript = ""
# build model to init mapping
modelToInit = {}
for module in initmodules:
for model in initmodules[module]:
if modelToInit.has_key(model):
modelToInit[model].append(module)
else:
modelToInit[model] = [module]
# check for duplicate init modules
for model in modelToInit:
modules = modelToInit[model]
if len(modules) > 1:
message = "Multiple smartInit modules " + str(modules) + \
" are enabled for D2D model: " + model + ". " + str(modules[1:]) + \
" will be disabled. Please edit your localConfig.py file and disable all but one."
# log error message to edex log
import LogStream
LogStream.logProblem(message);
# log error to alertViz
from com.raytheon.uf.edex.core import EDEXUtil
from com.raytheon.uf.common.status import UFStatus_Priority as Priority
EDEXUtil.sendMessageAlertViz(Priority.ERROR,
"com.raytheon.edex.plugin.gfe", "GFE", "GFE", message,
message, None)
# remove duplicate
for module in modules[1:]:
javainitmodules.remove(module)
return serverhost, mhsid, \ return serverhost, mhsid, \
port, javainitmodules, accumElem, \ port, initmodules, accumElem, \
initskips, d2ddbver, logfilepurge, prddir, home,\ initskips, d2ddbver, logfilepurge, prddir, home,\
extraWEPrecision, vtecRequestTime, \ extraWEPrecision, vtecRequestTime, \
autoConfigureNotifyTextProd, \ autoConfigureNotifyTextProd, \