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

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/students

Files:

• batching.py (modified) (9 diffs)
• tests/test_batching.py (modified) (5 diffs)

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

@@ -185 +185 @@
         return None
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
         """
@@ -230 +230 @@
         # apply other values...
         items_changed += super(StudentProcessor, self).updateEntry(
-            obj, row, site)
+            obj, row, site, filename)
 
         # Log actions...
@@ -238 +238 @@
             # Create mode: the record contains the student_id
             parent.logger.info(
-                '%s - Student record updated: %s'
-                % (obj.student_id, items_changed))
+                '%s - %s - %s - updated: %s'
+                % (self.name, filename, obj.student_id, items_changed))
         else:
             # Create mode: the student does not yet exist
-            parent.logger.info('Student data imported: %s' % items_changed)
+            # XXX: It seems that this never happens because student_id
+            # is always set.
+            parent.logger.info(
+                '%s - %s - %s - imported: %s' 
+                % (self.name, filename, obj.student_id, items_changed))
         return items_changed
 
@@ -418 +422 @@
         return student.get('studycourse')
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
         """
         items_changed = super(StudentStudyCourseProcessor, self).updateEntry(
-            obj, row, site)
+            obj, row, site, filename)
         parent = self.getParent(row, site)
         parent.__parent__.logger.info(
-            '%s - Study course updated: %s'
-            % (parent.student_id, items_changed))
+            '%s - %s - %s - updated: %s'
+            % (self.name, filename, parent.student_id, items_changed))
         # Update the students_catalog
         notify(grok.ObjectModifiedEvent(obj.__parent__))
@@ -503 +507 @@
         return
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
         """
         items_changed = super(StudentStudyLevelProcessor, self).updateEntry(
-            obj, row, site)
+            obj, row, site, filename)
         student = self.getParent(row, site).__parent__
         student.__parent__.logger.info(
-            '%s - Study level updated: %s'
-            % (student.student_id, items_changed))
+            '%s - %s - %s - updated: %s'
+            % (self.name, filename, student.student_id, items_changed))
         return
 
@@ -574 +578 @@
         return level.get(row['code'])
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
         """
         items_changed = super(CourseTicketProcessor, self).updateEntry(
-            obj, row, site)
+            obj, row, site, filename)
         parent = self.getParent(row, site)
         student = self.getParent(row, site).__parent__.__parent__
         student.__parent__.logger.info(
-            '%s - Course ticket in %s updated: %s'
-            % (student.student_id,  parent.level, items_changed))
+            '%s - %s - %s - %s - updated: %s'
+            % (self.name, filename, student.student_id, parent.level, items_changed))
         return
 
@@ -690 +694 @@
         return entry
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
         """
         items_changed = super(StudentOnlinePaymentProcessor, self).updateEntry(
-            obj, row, site)
+            obj, row, site, filename)
         student = self.getParent(row, site).__parent__
         student.__parent__.logger.info(
-            '%s - Payment ticket updated: %s'
-            % (student.student_id, items_changed))
+            '%s - %s - %s - updated: %s'
+            % (self.name, filename, student.student_id, items_changed))
         return
 
@@ -798 +802 @@
         return None
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
         """
@@ -804 +808 @@
         vals_to_set = dict((key, val) for key, val in row.items()
                            if key not in ('current_session','current_level'))
-        super(StudentVerdictProcessor, self).updateEntry(obj, vals_to_set, site)
+        super(StudentVerdictProcessor, self).updateEntry(
+            obj, vals_to_set, site, filename)
         parent = self.getParent(row, site)
         # Set current_vedict in corresponding studylevel

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

@@ -666 +666 @@
         # Logging message from updateEntry,
         self.assertTrue(
-            'INFO - system - K1000000 - Study level '
-            'updated: level=100, level_verdict=C, level_session=2009'
+            'INFO - system - StudentStudyLevel Processor - '
+            'sample_studylevel_data - K1000000 - updated: '
+            'level=100, level_verdict=C, level_session=2009'
             in logcontent)
 
@@ -788 +789 @@
         self.assertEqual(courseticket.semester, 1)
         shutil.rmtree(os.path.dirname(fin_file))
-
         logcontent = open(self.logfile).read()
         # Logging message from updateEntry,
         self.assertTrue(
-            'INFO - system - K1000000 - Course ticket in 100 updated: code=COURSE1, '
+            'INFO - system - CourseTicket Processor - '
+            'sample_courseticket_data - K1000000 - 100 - '
+            'updated: code=COURSE1, '
             'mandatory=False, score=3'
             in logcontent)
@@ -968 +970 @@
         # Logging message from updateEntry
         self.assertTrue(
-            'INFO - system - K1000001 - Payment ticket updated: '
+            'INFO - system - Student Payment Processor - '
+            'sample_payment_data - K1000001 - updated: '
             'p_item=BTECHBDT, creation_date=2010-02-15 13:19:01+00:00, '
             'p_category=schoolfee, amount_auth=19500.0, p_current=True, '
@@ -975 +978 @@
             in logcontent)
         self.assertTrue(
-            'INFO - system - K1000001 - Payment ticket updated: '
+            'INFO - system - Student Payment Processor - '
+            'sample_payment_data - K1000001 - updated: '
             'p_item=BTECHBDT, creation_date=2010-02-15 13:19:01+00:00, '
             'p_category=schoolfee, amount_auth=19500.6, p_current=True, '
@@ -1089 +1093 @@
         logcontent = open(self.logfile).read()
         self.assertMatches(
-            '... INFO - system - X666666 - Study course updated: current_verdict=0...',
+            '... INFO - system - Verdict Processor (special processor, '
+            'update only) - sample_verdict_data - X666666 - '
+            'updated: current_verdict=0...',
             logcontent)
         self.assertMatches(