Changeset 13199 for main/waeup.kofa/trunk

Timestamp:

15 Aug 2015, 20:08:02 (9 years ago)

Author:

Henrik Bettermann

Message:

Do only allow one running export job.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/browser/pages.py (modified) (2 diffs)
• src/waeup/kofa/browser/tests/test_browser.py (modified) (3 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.3.2.dev0 (unreleased)
 =======================
+
+* Do only allow one running export job.
 
 * Add switch to disable all exports.

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

@@ -246 +246 @@
         entries.append(new_entry)
     return entries
+
+def running_jobs(view):
+    """True if any job is running.
+    """
+    job_entries = view.context.get_running_export_jobs()
+    job_manager = getUtility(IJobManager)
+    entries = []
+    for entry in job_entries:
+        job = job_manager.get(entry[0])
+        status = job.finished and 'ready' or 'running'
+        status = job.failed and 'FAILED' or status
+        if status == 'running':
+            return True
+    return False
 
 def getImporters(context):
@@ -1752 +1766 @@
                 self.entries = doll_up(self, user=None)
                 return
+            if running_jobs(self):
+                self.flash(_(
+                    "Sorry, another export job is running. "
+                    "Please try again later."), type='danger')
+                self.entries = doll_up(self, user=None)
+                return
             job_id = self.context.start_export_job(
                 exporter, self.request.principal.id)

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

@@ -212 +212 @@
         self.browser.getControl(name="exporter").value = ['faculties']
         self.browser.getControl("Create CSV file").click()
-        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        # we can trigger export file creation only once
+        self.browser.getControl(name="exporter").value = ['departments']
+        self.browser.getControl("Create CSV file").click()
+        self.assertTrue('Sorry, another export job is running.'
+                         in self.browser.contents)
+        self.wait_for_export_job_completed()
+        self.assertEqual(len(self.app['datacenter'].running_exports), 1)
+        self.browser.getControl(name="exporter").value = ['departments']
+        self.browser.getControl("Create CSV file").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(len(self.app['datacenter'].running_exports), 2)
+        # The second job is running
+        self.assertTrue('<img src="/static/img/actionicon_reload.png" />'
+                         in self.browser.contents)
         self.cleanup_run_job() # make sure to remove temp dirs
+        # Also the second job must be cleaned up
+        manager = getUtility(IJobManager)
+        job_id = self.app['datacenter'].running_exports[1][0]
+        job = manager.get(job_id)
+        wait_for_result(job)
+        if os.path.exists(job.result):
+            shutil.rmtree(os.path.dirname(job.result))
         return
 
@@ -363 +383 @@
             'password,state,history,certcode,is_postgrad,current_level,'
             'current_session\r\n')
-        self.cleanup_run_job()
         logfile = os.path.join(
             self.app['datacenter'].storage, 'logs', 'datacenter.log')
@@ -376 +395 @@
             '- downloaded: WAeUP.Kofa_students_%s.csv, job_id=%s'
             % (job_id, job_id) in logcontent)
+        self.cleanup_run_job()
         return