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

Timestamp:

18 Nov 2012, 14:25:35 (12 years ago)

Author:

Henrik Bettermann

Message:

Log job_id. Now we can retrieve the information from the log file, who has created the report, who has downloaded the report and who has discarded the report.

Location:

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

Files:

• browser/reports.py (modified) (1 diff)
• students/reports.py (modified) (2 diffs)
• students/tests/test_reports.py (modified) (1 diff)

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

@@ -49 +49 @@
             self.flash('Report discarded: %s' % job_id)
             ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-            grok.getSite().logger.info('%s - discarded: %s' % (ob_class, job_id))
+            grok.getSite().logger.info(
+                '%s - report %s discarded' % (ob_class, job_id))
         self.entries = self._generate_entries(user_id=None)
         if job_id and DOWNLOAD:

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

@@ -189 +189 @@
                 mode=mode)
             self.flash(_('New report is being created in background'))
-            container.start_report_job(
+            job_id = container.start_report_job(
                 self.generator_name, user_id, kw=kw)
             ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
             grok.getSite().logger.info(
-                '%s - created: %s (session=%s, mode=%s)' % (
-                ob_class, self.context.title, session, mode))
+                '%s - report %s created: %s (session=%s, mode=%s)' % (
+                ob_class, job_id, self.context.title, session, mode))
             self.redirect(self.parent_url)
             return
@@ -227 +227 @@
         pdf_stream = self.context.create_pdf()
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-        grok.getSite().logger.info('%s - downloaded: %s' % (ob_class, filename))
+        grok.getSite().logger.info('%s - report %s downloaded: %s' % (
+            ob_class, self.context.__name__, filename))
         return pdf_stream

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

@@ -129 +129 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.StudentsReportGeneratorPage - '
-            'created: Students (session=2004, mode=All)' in logcontent
+            'report %s created: Students (session=2004, mode=All)'
+            % job_id in logcontent
             )
         self.assertTrue(
             'INFO - zope.mgr - students.reports.StudentsReportPDFView - '
-            'downloaded: StudentsReport_2004_2005_All_' in logcontent
+            'report %s downloaded: StudentsReport_2004_2005_All_'
+            % job_id in logcontent
             )
         self.assertTrue(
             'INFO - zope.mgr - browser.reports.ReportsContainerPage - '
-            'discarded: %s' % job_id in logcontent
+            'report %s discarded' % job_id in logcontent
             )
         return