Changeset 33415 for branches/meh_branches/ppstack_test/ippToPsps/jython/pslogger.py

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/pslogger.py (modified) (3 diffs)

branches/meh_branches/ppstack_test/ippToPsps/jython/pslogger.py

@@ -3 +3 @@
 import os
 import sys
+import socket
 
 class PSLogger(logging.getLoggerClass()): 
 
    '''
-   Sets up logging using values from the ippToPsps config file
+   Sets up logging using provided values and this process hostname and PID if sending to file
+   This will default to stout and no file output
    '''
-   def setup(self, doc, name, stdout=1, sendToFile=0):
+   def setup(self, programName, basePath, configName, host, pid, stdout=1, sendToFile=0):
 
        formatter = logging.Formatter('%(asctime)s | %(levelname)7s | %(message)s', '%Y-%m-%d %H:%M:%S')
@@ -15 +17 @@
 
        if sendToFile:
-           PATH = doc.find("localOutPath").text + "/log"
+
+           # generate path
+           PATH = basePath + "/log"
            if not os.path.exists(PATH): os.makedirs(PATH)
-           DVOLABEL = doc.find("dvo/gpc1Label").text
-           FULLPATH = PATH + "/" + name + "_" + DVOLABEL + ".log"
-
+           FULLPATH = PATH + "/" + programName + "_" + configName + "_" + host + "_" + str(pid) + ".log"
            # opens file to be appended
            hdlr = logging.FileHandler(FULLPATH, "a")
@@ -27 +29 @@
        if stdout:
            stdout = logging.StreamHandler(sys.__stdout__)
-           #stdout.setFormatter(formatter)
+           stdout.setFormatter(formatter)
            self.addHandler(stdout)