Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/queue.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/queue.py (modified) (5 diffs)

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

@@ -27 +27 @@
         super(Queue, self).__init__(argv)
 
-
         # create various objects
         self.gpc1Db = Gpc1Db(self.logger, self.config)
         self.datastore = Datastore(self.logger, self.config, self.ippToPspsDb)
-        self.dvoObjects = DvoObjects(self.logger, self.config)
+        try:
+            self.dvoObjects = DvoObjects(self.logger, self.config)
+        except:
+            self.exitProgram("Unable to create instance of DvoObject")
+            raise
 
         self.config.printAll()
@@ -115 +118 @@
                        while dec <= self.config.maxDec:
             
-                           self.checkClientStatus()
                            box_id = self.ippToPspsDb.insertBox(ra, dec)
             
@@ -134 +136 @@
                 self.logger.info("+-------------+-------------+-------------+-------------+")
 
+            self.checkClientStatus()
             if not self.waitForPollTime(): break
 
@@ -158 +161 @@
     '''
     def printUsage(self):
-        super(Cleanup, self).printUsage("[<repeat time in hours>]")
+        super(Queue, self).printUsage("[<repeat time in hours>]")
 
 
@@ -164 +167 @@
 Start of program.
 '''
-queue = Queue(sys.argv)
-queue.run()
-queue.exitProgram("finished")                             
+try:
+    queue = Queue(sys.argv)
+    queue.run()
+    queue.exitProgram("completed")
+except: pass
+