Changeset 33500

Timestamp:

Mar 13, 2012, 10:48:09 AM (14 years ago)

Author:

rhenders

Message:

some improvements to exitProgram and printUsage methods; removed some unecessary imports

File:

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

trunk/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):
@@ -58 +53 @@
         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.CONFIGNAME)
 
     '''
@@ -70 +68 @@
         except:
             pass
-
 
     '''
@@ -93 +90 @@
     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] + " <configPath> " + extra
+        try:
+            self.logger.errorPair("Usage:", msg)
+        except: 
+            print "*** Usage: " + msg
 
 
@@ -109 +111 @@
     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 +117 @@
        
         # 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 +139 @@
     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
@@ -140 +145 @@
             self.logger.infoPair("Program exited", exitReason)
         except: 
-            print "** program exited: " + exitReason
+            print "*** Program exited: " + exitReason
 
         # remove from database if possible