Changeset 33711

Timestamp:

Apr 4, 2012, 4:24:41 PM (14 years ago)

Author:

rhenders

Message:

now all programs have the ability to cycle through all 'active' configs

File:

• trunk/ippToPsps/jython/ipptopsps.py (modified) (5 diffs)

trunk/ippToPsps/jython/ipptopsps.py

@@ -30 +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()
@@ -38 +38 @@
         self.SECONDS = None
 
+        # should we rotate configs for this program?
+        if CONFIGNAME == "all": self.rotateConfigs = True
+        else:  self.rotateConfigs = False
+
         # set up config object
-        self.config = Config(self.PROGNAME, self.CONFIGNAME)
+        self.config = Config(self.PROGNAME, CONFIGNAME)
         self.logger = self.config.getLogger(self.HOST, self.PID, logToStdout, logToFile)
 
@@ -55 +59 @@
         self.logger.infoPair("Host", self.HOST)
         self.logger.infoPair("PID", "%d" % self.PID)
-        self.logger.infoPair("Config", self.CONFIGNAME)
+        self.logger.infoPair("Config", CONFIGNAME)
 
     '''
@@ -93 +97 @@
 
         # write message to log or stdout if no logger set up
-        msg = sys.argv[0] + " <configPath> " + extra
+        msg = sys.argv[0] + " <configName|all> " + extra
         try:
             self.logger.errorPair("Usage:", msg)
@@ -104 +108 @@
     '''
     def refreshConfig(self):
+
+        # 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)