Changeset 32227

Timestamp:

Aug 30, 2011, 11:14:27 AM (15 years ago)

Author:

rhenders

Message:

better logging for failed-datastore-queuing

File:

• trunk/ippToPsps/jython/load.py (modified) (4 diffs)

trunk/ippToPsps/jython/load.py

@@ -1 +1 @@
 #!/usr/bin/env jython
 
-# The starting point for ippTopsps. See usage below.
+#
+# The main loading program for ippToPsps. See usage below.
+#
 
 import time
@@ -24 +26 @@
 
     batchIDs = ippToPspsDb.getProcessedButFailedDatastoreBatchIDs(EPOCH, DVOGPC1LABEL, batchType)
-    logger.infoPair("Failed loads to datastore", "%d %s batches" % (len(batchIDs), batchType))
+    logger.infoPair("%s batches" % batchType, "%d" % len(batchIDs))
 
     for batchID in batchIDs:
@@ -154 +156 @@
 # print info to log
 logger.infoSeparator()
-logger.infoTitle("ippToPsps started")
+logger.infoTitle("ippToPsps loading started")
 logger.infoPair("Configuration file", CONFIG)
 logger.infoPair("Loading epoch", EPOCH)
@@ -183 +185 @@
 
     # queue up batches that are processed but not loaded to datastore
-    if QUEUE_P2: publishAnyUnpublishedBatches("P2")
-    if QUEUE_ST: publishAnyUnpublishedBatches("ST")
+    logger.infoTitle("Previous failed datastore loads")
+    publishAnyUnpublishedBatches("P2")
+    publishAnyUnpublishedBatches("ST")
 
     if QUEUE_P2: queueItems("P2")