Changeset 34041 for branches/meh_branches/ppstack_test/ippToPsps/jython/pollOdm.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/pollOdm.py (modified) (7 diffs)

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

@@ -33 +33 @@
             self.exitProgram("incorrect args")
 
+        # create Odm object
+        self.odm = Odm(self.logger)
+
         # get poll time arg
         if len(sys.argv) > 4: self.parsePollTimeArg(sys.argv[4]) 
@@ -39 +42 @@
         else: self.stages = [self.STAGE]
 
-        if self.BATCHTYPE == "all": self.batchTypes = ['P2', 'ST']
+        if self.BATCHTYPE == "all": self.batchTypes = ['IN', 'P2', 'ST', 'OB']
         else: self.batchTypes = [self.BATCHTYPE]
 
         for stage in self.stages: self.logger.infoPair("Checking stage", stage)
         for batchType in self.batchTypes: self.logger.infoPair("Checking batch type", batchType)
-
-    '''
-    Overrides base-class version
-    '''
-    def refreshConfig(self):
-        ret = super(PollOdm, self).refreshConfig()
-        self.odm = Odm(self.logger, self.config)
-        return ret
 
     '''
@@ -59 +54 @@
 
         while True:
+
+            self.logger.infoSeparator()
+            self.logger.infoPair("Config", self.config.name)
 
             for stage in self.stages: 
@@ -71 +69 @@
     '''
     def poll(self, batchType, stage):
-      
+     
+        
+
         if stage == "unloaded":
-            ids = self.ippToPspsDb.getUnloadedBatchIDs(self.config.epoch, self.config.dvoLabel, batchType)
+            ids = self.ippToPspsDb.getUnloadedBatchIDs(batchType)
         elif stage == "unmergeworthy":
-            ids = self.ippToPspsDb.getUnmergeWorthyBatchIDs(self.config.epoch, self.config.dvoLabel, batchType)
+            ids = self.ippToPspsDb.getUnmergeWorthyBatchIDs(batchType)
         elif stage == "unmerged":
-            ids = self.ippToPspsDb.getUnmergedBatchIDs(self.config.epoch, self.config.dvoLabel, batchType)
+            ids = self.ippToPspsDb.getUnmergedBatchIDs(batchType)
     
         self.logger.infoTitle("Checking %d %s %s batches" % (len(ids), stage, batchType))
@@ -117 +117 @@
     
             else:
-                    self.logger.info("| %9s | failed to poll ODM                                                                                                   |" % Batch.getNameFromID(id))
+                    self.logger.info("| %9s | failed to poll ODM                                                                                  |" % Batch.getNameFromID(id))
     
         self.logger.info("+-----------+----------------+----------------+----------------+----------------+----------------+----------------+")
@@ -126 +126 @@
     '''
     def printUsage(self):
-        super(PollOdm, self).printUsage()
-        print " <P2|ST|all> <unloaded|unmergeworthy|unmerged|all> [hours]"
-    
+        super(PollOdm, self).printUsage("<IN|P2|ST|OB|all> <unloaded|unmergeworthy|unmerged|all> [hours]")
     
     
@@ -134 +132 @@
 Program starts here
 '''
-pollodm = PollOdm(sys.argv)
-pollodm.run()
-pollodm.exitProgram("finished")
+try:
+    pollodm = PollOdm(sys.argv)
+    pollodm.run()
+    pollodm.exitProgram("completed")
+except: pass