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

Issue #2504 Add hostname to log path for GFESuite scripts

Browse source 
Change-Id: I734d8f6ec89720d23371bd9c1187ef95eeaf22eb

Former-commit-id: 2c3cad8a81 [formerly 25cf05060d] [formerly 2c3cad8a81 [formerly 25cf05060d] [formerly e13a34a8b3 [formerly 975cf49b49e6266081e7b9ebcce6782b3e411667]]]
Former-commit-id: e13a34a8b3
Former-commit-id: bfd5c96cd9 [formerly ca80941c5b]
Former-commit-id: d819cc2512
This commit is contained in:
Ron Anderson 2014-01-24 09:04:11 -06:00
parent 27cbedca7a
commit da1b299e40
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
## ##
import string, IrtAccess, JUtil, logging import string, IrtAccess, JUtil, logging
import xml, pickle, tempfile, os import xml, pickle, tempfile, os, socket
from xml.etree import ElementTree from xml.etree import ElementTree
from xml.etree.ElementTree import Element, SubElement from xml.etree.ElementTree import Element, SubElement
import LogStream import LogStream
@ -50,7 +50,7 @@ from com.raytheon.uf.common.localization import LocalizationContext_Localization
# 03/11/13 1759 dgilling Move siteConfig import into # 03/11/13 1759 dgilling Move siteConfig import into
# 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
# #
# #
@ -285,17 +285,17 @@ def getLogger(scriptName, logName=None, logLevel=logging.INFO):
# modify its include path with the proper siteConfig just before # modify its include path with the proper siteConfig just before
# execution time # execution time
import siteConfig import siteConfig
hostname = socket.gethostname().split('.')[0]
logPath = os.path.join(siteConfig.GFESUITE_LOGDIR, strftime("%Y%m%d", gmtime()), hostname)
if logName is None: if logName is None:
logPath = siteConfig.GFESUITE_LOGDIR + "/" + strftime("%Y%m%d", gmtime())
logName = scriptName + ".log" logName = scriptName + ".log"
else: else:
logPath = os.path.dirname(logName) logDir = os.path.dirname(logName)
if len(logPath) == 0: if len(logDir) > 0:
logPath = siteConfig.GFESUITE_LOGDIR + "/" + strftime("%Y%m%d", gmtime()) logPath = logDir
logName = os.path.basename(logName) logName = os.path.basename(logName)
logFile = logPath + "/" + logName logFile = os.path.join(logPath, logName)
if not os.path.exists(logPath): if not os.path.exists(logPath):
os.makedirs(logPath) os.makedirs(logPath)