Changeset 8742

Timestamp:

18 Jun 2012, 06:28:41 (12 years ago)

Author:

Henrik Bettermann

Message:

Simplify logging. Adjust to students.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• applicant.py (modified) (1 diff)
• browser.py (modified) (4 diffs)
• interfaces.py (modified) (1 diff)
• root.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py

@@ -67 +67 @@
         return
 
-    def loggerInfo(self, ob_class, comment=None):
-        target = self.applicant_id
-        return grok.getSite()['applicants'].logger_info(ob_class,target,comment)
+    def writeLogMessage(self, view, message):
+        ob_class = view.__implemented__.__name__.replace('waeup.kofa.','')
+        self.__parent__.__parent__.logger.info(
+            '%s - %s - %s' % (ob_class, self.applicant_id, message))
+        return
 
     @property

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -578 +578 @@
             else:
                 ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-                self.context.__parent__.logger_info(
-                    ob_class,result.applicant_id,msg)
+                self.context.__parent__.logger.info(
+                    '%s - %s - %s' % (ob_class, result.applicant_id, msg))
         if len(created):
             self.flash(_('${a} students successfully created.',
@@ -653 +653 @@
         success, msg, log = self.context.approveApplicantPayment()
         if log is not None:
-            ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-            self.context.__parent__.loggerInfo(ob_class, log)
+            self.context.__parent__.writeLogMessage(self, log)
         self.flash(msg)
         return
@@ -824 +823 @@
             self.wf_info.fireTransition(trans_id)
         self.flash(_('Form has been saved.'))
-        ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         if fields_string:
-            self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
+            self.context.writeLogMessage(self, 'saved: % s' % fields_string)
         return
 
@@ -856 +854 @@
             self.flash(_('Successfully removed: ${a}',
                 mapping = {'a':', '.join(deleted)}))
-            ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-            self.context.loggerInfo(
-                ob_class, 'removed: % s' % ', '.join(deleted))
+            self.context.writeLogMessage(
+                self, 'removed: % s' % ', '.join(deleted))
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py

@@ -438 +438 @@
     """
 
-    def loggerInfo(ob_class, comment):
+    def writeLogMessage(view, comment):
         """Adds an INFO message to the log file
         """

main/waeup.kofa/trunk/src/waeup/kofa/applicants/root.py

@@ -42 +42 @@
     logger_name = 'waeup.kofa.${sitename}.applicants'
     logger_filename = 'applicants.log'
-
-    def logger_info(self, target, ob_class, comment=None):
-        """Get the logger's info method.
-        """
-        self.logger.info('%s - %s - %s' % (
-                target, ob_class, comment))
-        return
 
 ApplicantsRoot = attrs_to_fields(ApplicantsRoot)