Changeset 38883

Timestamp:

Oct 18, 2015, 8:28:30 AM (11 years ago)

Author:

eugene

Message:

keep gpc1db and ipptopspsdb connections alive

Location:

trunk/ippToPsps/jython

Files:

• dvo.py (modified) (4 diffs)
• dvodetections.py (modified) (1 diff)
• dvodiffdetections.py (modified) (1 diff)
• dvodiffobjects.py (modified) (1 diff)
• dvoforceddetections.py (modified) (1 diff)
• dvoforcedobjects.py (modified) (1 diff)
• dvoobjects.py (modified) (1 diff)
• loader.py (modified) (1 diff)

trunk/ippToPsps/jython/dvo.py

@@ -35 +35 @@
 
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db):
+#   def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
         # set up logging
@@ -43 +44 @@
         self.ippToPspsDb = ippToPspsDb
         self.scratchDb = scratchDb
+        self.gpc1Db = gpc1Db
 
         # set up empty lists
@@ -158 +160 @@
         # timeout_sql = "set wait_timeout = 5"
         # self.scratchDb.execute(timeout_sql)
+
+        ## sql = "set global wait_timeout = 4"
+        ## print "---- sql: " + sql
+        ## self.scratchDb.execute(sql)
 
         (dvoStdoutFile, dvoStdoutName) = tempfile.mkstemp(prefix="dvopsps.stdout.", dir="/tmp")
@@ -240 +246 @@
         cmd += " -D CATDIR " + self.skychunk.dvoLocation
 
-        self.dvopspsRunWithPoll(cmd, "dvoSkyTable", 30)
+        self.dvopspsRunWithPoll(cmd, "dvoSkyTable", 2)
 
         self.logger.infoPair("Adding index to", self.scratchDb.dvoSkyTable)

trunk/ippToPsps/jython/dvodetections.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db):
+#   def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
-        super(DvoDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
+        super(DvoDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db)
+#       super(DvoDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
 
         # declare DVO file types of interest

trunk/ippToPsps/jython/dvodiffdetections.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db):
+#   def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
-        super(DvoDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
+        super(DvoDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db)
+#       super(DvoDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
 
         # declare DVO file types of interest

trunk/ippToPsps/jython/dvodiffobjects.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db):
+#   def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
-        super(DvoDiffObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
+        super(DvoDiffObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db)
+#       super(DvoDiffObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
 
         # declare DVO file types of interest

trunk/ippToPsps/jython/dvoforceddetections.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db):
+#   def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
-        super(DvoForcedDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
+        super(DvoForcedDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db)
+#       super(DvoForcedDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
 
         # declare DVO file types of interest

trunk/ippToPsps/jython/dvoforcedobjects.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db):
+#   def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
-        super(DvoForcedObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
+        super(DvoForcedObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db)
+#       super(DvoForcedObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
 
         # declare DVO file types of interest

trunk/ippToPsps/jython/dvoobjects.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db):
+#   def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
-        super(DvoObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
+        super(DvoObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb, gpc1Db)
+#       super(DvoObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
 
         # declare DVO file types of interest

trunk/ippToPsps/jython/loader.py

@@ -101 +101 @@
         except: return ret
            
-        self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+        self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
+#       self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
 
         return ret