Changeset 9706 for main/waeup.kofa/trunk/src/waeup/kofa/accesscodes

Timestamp:

21 Nov 2012, 22:37:03 (12 years ago)

Author:

Henrik Bettermann

Message:

Rework logging of batch processing. Remove redundant text but add name of import file.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes

Files:

• batching.py (modified) (4 diffs)
• tests/test_batching.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/batching.py

@@ -70 +70 @@
         return
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
 
@@ -76 +76 @@
         """
         items_changed = super(AccessCodeBatchProcessor, self).updateEntry(
-            obj, row, site)
+            obj, row, site, filename)
         # Log actions...
         location_field = self.location_fields[0]
-        grok.getSite()['accesscodes'].logger.info('%s - %s - Batch updated: %s'
-            % (self.name, row[location_field], items_changed))
+        grok.getSite()['accesscodes'].logger.info(
+            '%s - %s - %s - updated: %s'
+            % (self.name, filename, row[location_field], items_changed))
         return
 
@@ -180 +181 @@
         return None
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
 
@@ -215 +216 @@
 
         items_changed += super(AccessCodeProcessor, self).updateEntry(
-            obj, row, site)
+            obj, row, site, filename)
 
         # Log actions...
-        grok.getSite()['accesscodes'].logger.info('%s - %s - AC updated: %s'
-            % (self.name, row['representation'], items_changed))
-        return
+        grok.getSite()['accesscodes'].logger.info(
+            '%s - %s - %s - updated: %s'
+            % (self.name, filename, row['representation'], items_changed))
+        return

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_batching.py

@@ -111 +111 @@
         logcontent = open(self.logfile).read()
         self.assertTrue(
-            'system - AccessCodeBatch Processor - CLR-1 - '
-            'Batch updated: num=1, creator=system, used_num=1, '
+            'system - AccessCodeBatch Processor - sample_batch_data - '
+            'CLR-1 - updated: '
+            'num=1, creator=system, used_num=1, '
             'entry_num=3, creation_date=2012-04-28 07:28:48.719026+00:00, '
             'prefix=CLR, cost=0.0, disabled_num=0'
@@ -167 +168 @@
         logcontent = open(self.logfile).read()
         self.assertTrue(
-            'INFO - system - AccessCode Processor - CLR-1-1625368961 - '
-            'AC updated: state=used, batch_serial=33, random_num=1625368961, '
+            'INFO - system - AccessCode Processor - sample_ac_data - '
+            'CLR-1-1625368961 - updated: state=used, '
+            'batch_serial=33, random_num=1625368961, '
             'cost=100.0, owner=K1000009'
             in logcontent)