Changeset 13166 for main/waeup.kofa/trunk/src

Timestamp:

13 Jul 2015, 08:20:23 (9 years ago)

Author:

Henrik Bettermann

Message:

Adjust logging methods in the various section.

Location:

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

Files:

• applicants/interfaces.py (modified) (2 diffs)
• documents/interfaces.py (modified) (1 diff)
• hostels/browser.py (modified) (9 diffs)
• hostels/container.py (modified) (2 diffs)
• hostels/hostel.py (modified) (3 diffs)
• hostels/interfaces.py (modified) (5 diffs)
• students/interfaces.py (modified) (1 diff)

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

@@ -291 +291 @@
 
     def writeLogMessage(view, comment):
-        """Add an INFO message to the log file.
+        """Add an INFO message to ``applicants.log``.
         """
 
@@ -449 +449 @@
 
     def writeLogMessage(view, comment):
-        """Add an INFO message to the log file.
+        """Add an INFO message to ``applicants.log``.
         """
 

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

@@ -63 +63 @@
 
     def writeLogMessage(view, message):
-        """Write a view specific log message into main.log.
+        """Add an INFO message to ``main.log``.
         """
 

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

@@ -39 +39 @@
 from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
 
-def write_log_message(view, message):
-    ob_class = view.__implemented__.__name__.replace('waeup.kofa.','')
-    view.context.loggerInfo(ob_class, message)
-    return
-
 # Save function used for save methods in manager pages
 def msave(view, **data):
@@ -54 +49 @@
     view.flash(_('Form has been saved.'))
     if fields_string:
-        write_log_message(view, 'saved: % s' % fields_string)
+        view.context.writeLogMessage(view, 'saved: %s' % fields_string)
     return
 
@@ -146 +141 @@
             for id in child_id:
                 deleted.append(id)
-            write_log_message(self, 'deleted: % s' % ', '.join(deleted))
+            self.context.writeLogMessage(self, 'deleted: % s' % ', '.join(deleted))
         delSubobjects(self, redirect='@@manage', tab='2')
         return
@@ -159 +154 @@
         self.context.clearAllHostels()
         self.flash(_('All hostels cleared.'))
-        write_log_message(self, 'all hostels cleared')
+        self.context.writeLogMessage(self, 'all hostels cleared')
         self.redirect(self.url(self.context, '@@manage')+'#tab2')
         return
@@ -192 +187 @@
             return
         self.flash(_('Hostel created.'))
-        write_log_message(self, 'added: % s' % data['hostel_name'])
+        self.context.writeLogMessage(self, 'added: % s' % data['hostel_name'])
         self.redirect(self.url(self.context[hostel.hostel_id], 'index'))
         return
@@ -254 +249 @@
             mapping = {'a':removed, 'b':added, 'c':modified, 'd':modified_beds})
         self.flash(flash_message)
-        write_log_message(self, message)
+        self.context.writeLogMessage(self, message)
         self.redirect(self.url(self.context, '@@manage')+'#tab2')
         return
@@ -284 +279 @@
             self.flash(_('Successfully switched beds: ${a}',
                 mapping = {'a':m_translated}))
-            write_log_message(self, 'switched: %s' % message)
+            self.context.writeLogMessage(self, 'switched: %s' % message)
             self.redirect(self.url(self.context, '@@manage')+'#tab2')
         return
@@ -308 +303 @@
             self.flash(_('Successfully released beds: ${a}',
                 mapping = {'a':message}))
-            write_log_message(self, 'released: %s' % message)
+            self.context.writeLogMessage(self, 'released: %s' % message)
             self.redirect(self.url(self.context, '@@manage')+'#tab2')
         else:
@@ -319 +314 @@
         self.context.clearHostel()
         self.flash(_('Hostel cleared.'))
-        write_log_message(self, 'cleared')
+        self.context.writeLogMessage(self, 'cleared')
         self.redirect(self.url(self.context, '@@manage')+'#tab2')
         return

main/waeup.kofa/trunk/src/waeup/kofa/hostels/container.py

@@ -52 +52 @@
         return
 
-    logger_name = 'waeup.kofa.${sitename}.hostels'
-    logger_filename = 'hostels.log'
-
-    def logger_info(self, ob_class, target, comment=None):
-        """Get the logger's info method.
-        """
-        self.logger.info('%s - %s - %s' % (
-                ob_class, target, comment))
-        return
-
-    def loggerInfo(self, ob_class, comment=None):
-        target = self.__name__
-        return self.logger_info(ob_class,target,comment)
-
     @property
     def expired(self):
@@ -78 +64 @@
         return False
 
+    logger_name = 'waeup.kofa.${sitename}.hostels'
+    logger_filename = 'hostels.log'
+
+    def writeLogMessage(self, view, message):
+        ob_class = view.__implemented__.__name__.replace('waeup.kofa.','')
+        self.logger.info(
+            '%s - %s - %s' % (ob_class, self.__name__, message))
+        return
+
 HostelsContainer = attrs_to_fields(HostelsContainer)

main/waeup.kofa/trunk/src/waeup/kofa/hostels/hostel.py

@@ -37 +37 @@
     grok.implements(IHostel)
     grok.provides(IHostel)
-
-    def loggerInfo(self, ob_class, comment=None):
-        target = self.__name__
-        return grok.getSite()['hostels'].logger_info(ob_class,target,comment)
 
     @property
@@ -139 +135 @@
         return removed_counter, added_counter, modified_counter, modified_beds
 
+    def writeLogMessage(self, view, message):
+        ob_class = view.__implemented__.__name__.replace('waeup.kofa.','')
+        self.__parent__.logger.info(
+            '%s - %s - %s' % (ob_class, self.__name__, message))
+        return
+
 Hostel = attrs_to_fields(Hostel)
 
@@ -268 +270 @@
             return old_owner
 
-    def loggerInfo(self, ob_class, comment=None):
-        target = self.__name__
-        return grok.getSite()['hostels'].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.__name__, message))
+        return
 
 Bed = attrs_to_fields(Bed)

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

@@ -71 +71 @@
         """
 
-    def logger_info(ob_class, target, comment=None):
-        """Get the logger's info method.
+    def writeLogMessage(view, message):
+        """Add an INFO message to ``hostels.log``.
         """
 
@@ -80 +80 @@
 
     bed_statistics = Attribute('Number of booked and total beds')
-
-    def loggerInfo(ob_class, comment):
-        """Adds an INFO message to the log file
-        """
 
     def clearHostel():
@@ -211 +207 @@
             raise Invalid(_('Bed categories overlap.'))
 
+    def writeLogMessage(view, message):
+        """Add an INFO message to ``hostels.log``.
+        """
+
 class IBed(IKofaObject):
     """A base representation of beds.
@@ -216 +216 @@
 
     coordinates = Attribute('The coordinates of the bed from bed_id')
-
-    def loggerInfo(ob_class, comment):
-        """Adds an INFO message to the log file
-        """
 
     def bookBed(student_id):
@@ -272 +268 @@
             raise Invalid(_(
                 "This student resides in bed ${a}.", mapping = {'a':allocated_bed}))
+
+    def writeLogMessage(view, message):
+        """Add an INFO message to ``hostels.log``.
+        """

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

@@ -154 +154 @@
 
     def writeLogMessage(view, message):
-        """Write a view specific log message into students.log.
+        """Add an INFO message to ``students.log``.
         """