Changeset 34041 for branches/meh_branches/ppstack_test/ippToPsps/jython/ipptopsps.py

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/ipptopsps.py (modified) (11 diffs)

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

@@ -11 +11 @@
 from pslogger import PSLogger
 from ipptopspsdb import IppToPspsDb
-from dxlayer import DXLayer
-from datastore import Datastore
-from dvo import Dvo
-from odm import Odm
-
 
 '''
 Abstract base class for all ippToPsps programs
-handle command-line args, setting up of Config and logger objects, clean exiting etc 
+Handles command-line args, setting up of Config and logger objects, clean exiting etc
 '''
 class IppToPsps(object):
@@ -26 +21 @@
     Constructor
     '''
-    def __init__(self, argv):
+    def __init__(self, argv, logToStdout=1, logToFile=0):
 
         # are the arsg ok? all programs require a config name
@@ -35 +30 @@
         # some class constants
         self.PROGNAME = sys.argv[0]
-        self.CONFIGNAME = sys.argv[1]
+        CONFIGNAME = sys.argv[1]
         self.HOST = socket.gethostname()
         self.PID = os.getpid()
@@ -43 +38 @@
         self.SECONDS = None
 
+        self.createNewConfig = False
+        self.rotateConfigs = False
+        # a new config?
+        if CONFIGNAME == "edit": self.createNewConfig = True
+        # should we rotate configs for this program?
+        elif CONFIGNAME == "all": self.rotateConfigs = True
+
         # set up config object
-        self.config = Config(self.PROGNAME, self.CONFIGNAME)
-        self.logger = self.config.getLogger(self.HOST, self.PID, 1, 1)
+        self.config = Config(self.PROGNAME, CONFIGNAME)
+        self.logger = self.config.getLogger(self.HOST, self.PID, logToStdout, logToFile)
 
         # create connection to databases database
-        self.ippToPspsDb = IppToPspsDb(self.logger, self.config)
+        try:
+            self.ippToPspsDb = IppToPspsDb(self.logger, self.config)
+        except:
+            self.exitProgram("Could not connect to ipptopsps Db")
+            raise
 
         self.checkClientStatus()
@@ -58 +64 @@
         self.logger.infoSeparator()
         self.logger.infoTitle("ippToPsps '" + self.PROGNAME + "' started")
+        self.logger.infoPair("Host", self.HOST)
+        self.logger.infoPair("PID", "%d" % self.PID)
+        self.logger.infoPair("Config", self.config.name)
 
     '''
@@ -70 +79 @@
         except:
             pass
-
 
     '''
@@ -93 +101 @@
     Prints usage to stdout
     '''
-    def printUsage(self):
-        # using sys.stdout to avoid newline in case sub-classes need to add further args
-        sys.stdout.write("** Usage: " + sys.argv[0] + " <configPath>")
+    def printUsage(self, extra=""):
 
+        # write message to log or stdout if no logger set up
+        msg = sys.argv[0] + " <configName|all|edit> " + extra
+        try:
+            self.logger.errorPair("Usage:", msg)
+        except: 
+            print "*** Usage: " + msg
 
     '''
@@ -102 +114 @@
     '''
     def refreshConfig(self):
+
+        # new config?
+        if self.createNewConfig: 
+            self.ippToPspsDb.editConfig()
+            self.ippToPspsDb.setConfigForThisClient(self.config.name, self.HOST, self.PID)
+            self.createNewConfig = False
+
+        # if we are rotating configs, then look for next active one in list
+        if self.rotateConfigs:
+            self.ippToPspsDb.getConfigForThisClient(self.HOST, self.PID)
+            configs = self.ippToPspsDb.getActiveConfigList()
+             
+            i = 1
+            for config in configs:
+               if config == self.config.name: break
+               i += 1
+
+            if i >= len(configs): newConfig = configs[0]
+            else: newConfig = configs[i]
+
+            self.ippToPspsDb.setConfigForThisClient(newConfig, self.HOST, self.PID)
+
         return self.ippToPspsDb.readConfig(self.HOST, self.PID)
 
@@ -109 +143 @@
     def checkClientStatus(self):
 
-        self.ippToPspsDb.updateClient(self.PROGNAME, self.HOST, self.PID, self.config.name)
+        self.ippToPspsDb.updateClient(self.PROGNAME, self.HOST, self.PID)
 
         if self.ippToPspsDb.isKilled(self.HOST, self.PID): 
@@ -115 +149 @@
        
         # this loop pauses the process if we have no config or we have set it to pause
+        firstTimeIn = True
         while not self.refreshConfig() or self.ippToPspsDb.isPaused(self.HOST, self.PID):
 
-            self.ippToPspsDb.updateClient(self.PROGNAME, self.HOST, self.PID,  self.config.name)
-            if self.ippToPspsDb.isKilled(self.HOST, self.PID): self.exitProgram("killed while paused")
-            self.logger.infoPair("Paused. Will check again in", "%d secs" % self.PAUSEPERIOD)
+            self.ippToPspsDb.updateClient(self.PROGNAME, self.HOST, self.PID)
+            if self.ippToPspsDb.isKilled(self.HOST, self.PID): 
+                self.exitProgram("killed while paused")
+            if firstTimeIn: self.logger.infoPair("Paused. Will check again every", "%d secs" % self.PAUSEPERIOD)
+            firstTimeIn = False
             time.sleep(self.PAUSEPERIOD)
 
@@ -134 +171 @@
     Exits the program cleanly, removes info from ipptopsps database
     '''
-    def exitProgram(self, exitReason):
+    def exitProgram(self, exitReason="quit"):
 
         # write message to log or stdout if no logger set up
         try:
-            self.logger.infoPair("Program exited", exitReason)
+            self.logger.infoPair(self.PROGNAME + " exited", exitReason)
         except: 
-            print "** program exited: " + exitReason
+            print "*** Program exited: " + exitReason
 
         # remove from database if possible