Changeset 35235 for branches/eam_branches/ipp-20130207/ippToPsps/jython/config.py

Timestamp:

Mar 5, 2013, 2:23:09 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207/ippToPsps

Files:

• . (modified) (1 prop)
• jython/config.py (modified) (5 diffs)

branches/eam_branches/ipp-20130207/ippToPsps/jython/config.py

@@ -38 +38 @@
         ## output file.  we blindly set name == argv[1] 
         ## programs which are called without argv[1] will use 'none' in the log file
+        self.name = None
         if len(sys.argv) >= 2:
             self.name = sys.argv[1]
@@ -57 +58 @@
         self.settingsDoc = ElementTree(file=self.settingsPath)
         self.logPath = self.settingsDoc.find("logPath").text
+        self.czarPlotsPath = self.settingsDoc.find("czarPlotsPath").text
+
+
 
         print "config.programName: ", self.programName
@@ -63 +67 @@
         print "config.logPath: ", self.logPath
         print "config.test: ", self.test
+        print "config.czarPlotsPath: ", self.czarPlotsPath
+
+        root = self.settingsDoc.getroot()
+        localdb = root.find('localdatabase')
+        for loaderhost in localdb.findall('loaderhost'):
+          name = loaderhost.get('name')
+          dbname = loaderhost.find('dbname').text
+          dbhost = loaderhost.find('host').text
+          print "loaderhost / dbhost : ", name, dbname, dbhost
+
 
     '''
@@ -69 +83 @@
     def getLogger(self, host, pid, stdout=1, sendToFile=0):
         
-        print "get Logger: ", host, pid
         logging.setLoggerClass(PSLogger)
-        print "done Logger 1"
         self.logger = logging.getLogger(self.programName)
-        print "done Logger 2"
         if (self.name is None):
             self.logger.setup(self.programName, self.logPath, "none", host, pid, stdout, sendToFile)
         else:
             self.logger.setup(self.programName, self.logPath, self.name, host, pid, stdout, sendToFile)
-        print "done Logger 3"
 
         return self.logger
@@ -85 +95 @@
     Various db metadata getters
     '''
-    def getDbName(self, dbType): return self.settingsDoc.find(dbType +"/name").text
-    def getDbHost(self, dbType): return self.settingsDoc.find(dbType +"/host").text
-    def getDbUser(self, dbType): return self.settingsDoc.find(dbType +"/user").text
-    def getDbPassword(self, dbType): return self.settingsDoc.find(dbType +"/password").text
+    def getDbName(self, dbType): 
+        if dbType == 'localdatabase' or dbType == 'localdatabase_test':
+            return self.scratchDbLeaf.find('name').text
+        else:
+            return self.settingsDoc.find(dbType +"/name").text
+
+    def getDbHost(self, dbType): 
+        if dbType == 'localdatabase' or dbType == 'localdatabase_test':
+            return self.scratchDbLeaf.find('host').text
+        else:
+            return self.settingsDoc.find(dbType +"/host").text
+
+    def getDbUser(self, dbType): 
+        if dbType == 'localdatabase' or dbType == 'localdatabase_test':
+            return self.scratchDbLeaf.find('user').text
+        else:
+            return self.settingsDoc.find(dbType +"/user").text
+
+    def getDbPassword(self, dbType): 
+        if dbType == 'localdatabase' or dbType == 'localdatabase_test':
+            return self.scratchDbLeaf.find('password').text
+        else:
+            return self.settingsDoc.find(dbType +"/password").text
+
+    def setScratchDbLeaf(self, myhost):
+        root = self.settingsDoc.getroot()
+        if (self.test):
+            localdb = root.find('localdatabase_test')
+        else:
+            localdb = root.find('localdatabase')
+
+        for loaderhost in localdb.findall('loader'):
+          name = loaderhost.get('mach')
+          print "name, myhost: ", name, myhost
+          if name == myhost:
+              self.scratchDbLeaf = loaderhost
+              return 1
+
+        for loaderhost in localdb.findall('loader'):
+          name = loaderhost.get('mach')
+          print "name, myhost: ", name, myhost
+          if name == 'generic':
+              self.scratchDbLeaf = loaderhost
+              return 1
+
+        print "Config Error: cannot find valid scratch db matching ", myhost, "or generic"
+        raise