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

Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1

Browse source 
Former-commit-id: 3b90abdf7a [formerly 880329e4ae] [formerly 3b90abdf7a [formerly 880329e4ae] [formerly 9943a331c3 [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]]]
Former-commit-id: 9943a331c3
Former-commit-id: 2c8e6ec2fc [formerly 62c2a8b843]
Former-commit-id: 989b873f6e
This commit is contained in:
Brian.Dyke 2014-04-18 07:53:10 -04:00
commit ddee08368a
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
View file

@ -86,6 +86,7 @@ from com.raytheon.uf.edex.database.cluster import ClusterTask
# Changed WECache to limit the number of cached grids kept in memory # Changed WECache to limit the number of cached grids kept in memory
# 01/09/14 16952 randerso Fix regression made in #2517 which caused errors with overlapping grids # 01/09/14 16952 randerso Fix regression made in #2517 which caused errors with overlapping grids
# 02/04/14 17042 ryu Check in changes for randerso. # 02/04/14 17042 ryu Check in changes for randerso.
# 04/11/2014 17242 David Gillingham (code checked in by zhao)
# #
BATCH_DELAY = 0.0 BATCH_DELAY = 0.0
@ -908,8 +909,7 @@ class IscMosaic:
destGrid, history = grid destGrid, history = grid
self.__dbGrid = (destGrid, history, tr) self.__dbGrid = (destGrid, history, tr)
else: else:
self.logProblem("Unable to access grid for ", logger.error("Unable to access grid for "+self.__printTR(tr) +" for " + self.__parmName)
self.__printTR(tr), "for ", self.__parmName)
return None return None
return (self.__dbGrid[0], self.__dbGrid[1]) return (self.__dbGrid[0], self.__dbGrid[1])

7
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
View file

@ -51,6 +51,7 @@ from com.raytheon.uf.common.localization import LocalizationContext_Localization
# methods where it's needed. # methods where it's needed.
# 11/07/13 2517 randerso Allow getLogger to override logLevel # 11/07/13 2517 randerso Allow getLogger to override logLevel
# 01/22/14/ 2504 randerso Added hostname to log path # 01/22/14/ 2504 randerso Added hostname to log path
# 04/10/2014 17241 David Gillingham (code checked in by zhao)
# #
# #
@ -297,8 +298,12 @@ def getLogger(scriptName, logName=None, logLevel=logging.INFO):
logFile = os.path.join(logPath, logName) logFile = os.path.join(logPath, logName)
if not os.path.exists(logPath): try:
os.makedirs(logPath) os.makedirs(logPath)
except OSError as e:
import errno
if e.errno != errno.EEXIST:
raise e
theLog = logging.getLogger(scriptName) theLog = logging.getLogger(scriptName)
theLog.setLevel(logLevel) theLog.setLevel(logLevel)