Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/ipptopsps.py

Timestamp:

May 29, 2012, 5:07:20 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20120405/ippToPsps/jython/ipptopsps.py (modified) (6 diffs)

branches/eam_branches/ipp-20120405/ippToPsps/jython/ipptopsps.py

@@ -38 +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?
-        if CONFIGNAME == "all": self.rotateConfigs = True
-        else:  self.rotateConfigs = False
+        elif CONFIGNAME == "all": self.rotateConfigs = True
 
         # set up config object
@@ -47 +50 @@
 
         # 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()
@@ -59 +66 @@
         self.logger.infoPair("Host", self.HOST)
         self.logger.infoPair("PID", "%d" % self.PID)
-        self.logger.infoPair("Config", CONFIGNAME)
+        self.logger.infoPair("Config", self.config.name)
 
     '''
@@ -97 +104 @@
 
         # write message to log or stdout if no logger set up
-        msg = sys.argv[0] + " <configName|all> " + extra
+        msg = sys.argv[0] + " <configName|all|edit> " + extra
         try:
             self.logger.errorPair("Usage:", msg)
@@ -103 +110 @@
             print "*** Usage: " + msg
 
-
     '''
     Refreshes the config then recreates objects with new settings
     '''
     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
@@ -163 +175 @@
         # 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