Changeset 35178

Timestamp:

Feb 19, 2013, 8:27:58 AM (13 years ago)

Author:

eugene

Message:

fix setupScratchDb.py to work with new config layout

Location:

trunk/ippToPsps/jython

Files:

• config.py (modified) (2 diffs)
• setupScratchDb.py (modified) (4 diffs)

trunk/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]
@@ -78 +79 @@
     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

trunk/ippToPsps/jython/setupScratchDb.py

@@ -57 +57 @@
         self.config = Config()
 
-        if len(argv) < 2:
+        if len(argv) != 1:
             self.printUsage()
             self.exitProgram("incorrect args")
@@ -65 +65 @@
         self.PID = os.getpid()
 
+        self.config.setScratchDbLeaf(self.HOST)
+
         # XXX Shouldn't config set up logger? 
         # (not yet, since we set HOST & PID with program...)
@@ -70 +72 @@
 
         try:
-            self.scratchDb = ScratchDb(self.logger, self.config, argv[1])
+            self.scratchDb = ScratchDb(self.logger, self.config)
         except:
             self.exitProgram("Could not connect to a scratch Db")
@@ -100 +102 @@
     def printUsage(self):
         # write message to log or stdout if no logger set up
-        msg = os.path.basename(sys.argv[0]) + " <scratchdb_version> "
+        msg = os.path.basename(sys.argv[0]) + " [-test]"
         try:
             self.logger.errorPair("Usage:", msg)