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

Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development

Browse source 
Former-commit-id: e1585c58e1 [formerly 810ad594a1] [formerly c13942140a] [formerly 6f4a63000d [formerly c13942140a [formerly 0729266c3f82eccdbf6835789898291ad34451c4]]]
Former-commit-id: 6f4a63000d
Former-commit-id: 3eb2456c26e36a840ecec7dab9cc4390d60c3a47 [formerly c07544b904]
Former-commit-id: ee5658f9d9
This commit is contained in:
Ron Anderson 2014-02-20 09:55:56 -06:00 • committed by Gerrit Code Review
commit 81b8bf2374
5 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfigManager.java
View file

@ -54,6 +54,8 @@ import com.raytheon.uf.common.util.FileUtil;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Jul 9, 2009 njensen Initial creation * Jul 9, 2009 njensen Initial creation
* Dec 11, 2012 14360 ryu Throw specific exception for missing configuration. * Dec 11, 2012 14360 ryu Throw specific exception for missing configuration.
* Feb 20, 2014 #2824 randerso Fixed import of localVTECPartners to use siteID
* Added common python path for LogStream
* *
* </pre> * </pre>
* *
@ -163,12 +165,15 @@ public class IFPServerConfigManager {
} }
siteDir = siteDirFile.getPath(); siteDir = siteDirFile.getPath();
String vtecPath = GfePyIncludeUtil.getVtecIncludePath(); String commonPythonPath = GfePyIncludeUtil.getCommonPythonIncludePath();
String vtecPath = GfePyIncludeUtil.getVtecIncludePath(siteID);
PythonScript py = null; PythonScript py = null;
try { try {
py = new PythonScript(FileUtil.join(baseDir, "wrapper.py"), py = new PythonScript(FileUtil.join(baseDir, "wrapper.py"),
PyUtil.buildJepIncludePath(siteDir, baseDir, vtecPath), PyUtil.buildJepIncludePath(siteDir, baseDir,
commonPythonPath, vtecPath),
IFPServerConfig.class.getClassLoader()); IFPServerConfig.class.getClassLoader());
SimpleServerConfig simpleConfig = (SimpleServerConfig) py.execute( SimpleServerConfig simpleConfig = (SimpleServerConfig) py.execute(
"getSimpleConfig", null); "getSimpleConfig", null);

15
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/Maps.py
View file

@ -20,8 +20,18 @@
# NOTE: THIS FILE SHOULD NOT BE USER_MODIFIED. INSTEAD, REFER TO THE # NOTE: THIS FILE SHOULD NOT BE USER_MODIFIED. INSTEAD, REFER TO THE
# DOCUMENTATION ON HOW ENTRIES IN THIS FILE MAY BE OVERRIDDEN. REFER TO # DOCUMENTATION ON HOW ENTRIES IN THIS FILE MAY BE OVERRIDDEN. REFER TO
# LOCALMAPS DOCUMENTATION. # LOCALMAPS DOCUMENTATION.
#
# Maps.py - map background definitions for ifpServer # Maps.py - map background definitions for ifpServer
#
# ----------------------------------------------------------------------------
#
# SOFTWARE HISTORY
#
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 02/20/2014 #2824 randerso Added log message when no localMaps file is found
#
########################################################################
from ShapeTable import ShapeTable from ShapeTable import ShapeTable
@ -311,7 +321,8 @@ if not BASELINE:
try: try:
from localMaps import * from localMaps import *
except ImportError: except ImportError:
pass import LogStream
LogStream.logEvent("No localMaps file found, using baseline settings.");
def getMaps(): def getMaps():
from java.util import ArrayList from java.util import ArrayList

5
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
View file

@ -33,8 +33,9 @@
# 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
# 10/03/2013 #2418 dgilling Update for new pSurge 2.0 data. # 10/03/2013 #2418 dgilling Update for new pSurge 2.0 data.
# 10/03/2013 2424 randerso Change localTC to use dateutil instead of pytz # 10/03/2013 #2424 randerso Change localTC to use dateutil instead of pytz
# to get correct offsets for Alaska # to get correct offsets for Alaska
# 02/20/2014 #2824 randerso Added log message when local override files are not found
# #
######################################################################## ########################################################################
@ -57,6 +58,8 @@ def siteImport(modName):
if fp: if fp:
fp.close() fp.close()
except ImportError: except ImportError:
import LogStream
LogStream.logEvent("No " + modName + " file found, using baseline settings.");
return 0 return 0
globals()[modName] = __import__(modName) globals()[modName] = __import__(modName)
return 1 return 1

5
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/vtecsharing/FetchActiveTableSrv.java
View file

@ -49,7 +49,8 @@ import com.raytheon.uf.edex.site.ISiteActivationListener;
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Feb 28, 2013 dgilling Initial creation * Feb 28, 2013 dgilling Initial creation
* Feb 20, 2014 #2824 randerso Changed log level of message when activating FetchAT
* *
* </pre> * </pre>
* *
@ -80,7 +81,7 @@ public class FetchActiveTableSrv implements ISiteActivationListener {
FetchATJobConfig config = new FetchATJobConfig(configData); FetchATJobConfig config = new FetchATJobConfig(configData);
final String site = config.getSiteId(); final String site = config.getSiteId();
statusHandler.debug("Activating FetchAT for " + site); statusHandler.info("Activating FetchAT for " + site);
statusHandler.debug("Site: " + site + " config: " + config); statusHandler.debug("Site: " + site + " config: " + config);
if ((siteConfigMap.containsKey(site)) if ((siteConfigMap.containsKey(site))

6
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/VTECPartners.py
View file

@ -26,6 +26,7 @@
# Date Ticket# Engineer Description # Date Ticket# Engineer Description
# ------------ ---------- ----------- -------------------------- # ------------ ---------- ----------- --------------------------
# 06/11/13 #2083 randerso Fixed getISCSites to look in configured # 06/11/13 #2083 randerso Fixed getISCSites to look in configured
# 02/20/2014 #2824 randerso Added log message when no localVTECPartners file is found
#VTEC_Partners.py - configuration file to control filtering and merging #VTEC_Partners.py - configuration file to control filtering and merging
#of VTEC active table. #of VTEC active table.
@ -298,5 +299,6 @@ except:
#allow overrides #allow overrides
try: try:
from localVTECPartners import * from localVTECPartners import *
except: except ImportError:
pass import LogStream
LogStream.logEvent("No localVTECPartners file found, using baseline settings.");