Changeset 4885 for waeup

Timestamp:

23 Jan 2010, 18:02:10 (15 years ago)

Author:

uli

Message:

Stop writing logfiles. Instead we now write to a passed logger.

File:

• waeup/trunk/src/waeup/utils/batching.py (modified) (4 diffs)

waeup/trunk/src/waeup/utils/batching.py

@@ -188 +188 @@
 
     def createLogfile(self, path, fail_path, num, warnings, mode, user,
-                      timedelta):
-        """Write a log file.
-        """
-        failmsg_path = "%s.%s.msg" % (path, mode)
-        fd = open(failmsg_path, 'wb')
-        fd.write("Source: %s\n" % path)
-        fd.write("Mode: %s\n" % mode)
-        fd.write("Date: %s\n" % time.ctime())
-        fd.write("User: %s\n" % user)
-        fd.write("Failed datasets: %s\n" % fail_path)
-        fd.write("Processing time: %0.3f s (%0.4f s/item)\n" % (
-                timedelta, timedelta/(num or 1)))
-        fd.write("Processed: %s lines (%s successful/ %s failed)\n" % (
-                num, num - warnings, warnings
+                      timedelta, logger=None):
+        """Write to log file.
+        """
+        if logger is None:
+            return
+        status = 'OK'
+        if warnings > 0:
+            status = 'FAILED'
+        logger.info("-" * 20)
+        logger.info("%s: Batch processing finished: %s" % (user, status))
+        logger.info("%s: Source: %s" % (user, path))
+        logger.info("%s: Mode: %s" % (user, mode))
+        #logger.info("Date: %s" % time.ctime())
+        logger.info("%s: User: %s" % (user, user))
+        if warnings > 0:
+            logger.info("%s: Failed datasets: %s" % (user, fail_path))
+        logger.info("%s: Processing time: %0.3f s (%0.4f s/item)" % (
+                user, timedelta, timedelta/(num or 1)))
+        logger.info("%s: Processed: %s lines (%s successful/ %s failed)" % (
+                user, num, num - warnings, warnings
                 ))
+        logger.info("-" * 20)
         return
 
@@ -217 +224 @@
         return
     
-    def doImport(self, path, headerfields, mode='create', user='Unknown'):
+    def doImport(self, path, headerfields, mode='create', user='Unknown',
+                 logger=None):
         """Perform actual import.
         """
@@ -227 +235 @@
         
         failed_path = "%s.%s.pending" % (path, mode, )
-        failed_headers = [x for x in mapping.values()
-               if x != '--IGNORE--']
+        failed_headers = [x for x in mapping.values()]
+        # if x != '--IGNORE--']
         failed_headers.append('--ERRORS--')
         failed_writer = csv.DictWriter(open(failed_path, 'wb'),
@@ -290 +298 @@
             failed_path = path
         self.createLogfile(path, failed_path, num, num_warns, mode, user,
-                           timedelta)
+                           timedelta, logger=logger)
         if num_warns == 0:
             del failed_writer