From 0d8117fbce1d6b0e66911451ac7394b61bb16526 Mon Sep 17 00:00:00 2001
From: Janez K <janez.kranjc@gmail.com>
Date: Mon, 17 Mar 2014 15:18:59 +0100
Subject: [PATCH] fix

---
 workflows/models.py | 27 +++++++++++----------------
 workflows/tasks.py  |  6 +++++-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/workflows/models.py b/workflows/models.py
index 8af9360..246dd49 100644
--- a/workflows/models.py
+++ b/workflows/models.py
@@ -15,7 +15,7 @@ from mothra.settings import USE_CONCURRENCY
 if USE_CONCURRENCY:
     from workflows.tasks import runWidgetAsync, runForLoopIteration
 
-from workflows.tasks import executeWidgetFunction, executeWidgetProgressBar, executeWidgetStreaming, executeWidgetWithRequest
+from workflows.tasks import executeWidgetFunction, executeWidgetProgressBar, executeWidgetStreaming, executeWidgetWithRequest, runWidget
 
 class WidgetException(Exception):
     pass
@@ -425,6 +425,13 @@ class Widget(models.Model):
             pass
 
     def run(self,offline):
+        if self.abstract_widget.windows_queue:
+            t = runWidget.apply_async([self,offline],queue="windows")
+            t.wait()
+        else:
+            self.proper_run(offline)
+
+    def proper_run(self,offline):
         if not self.ready_to_run():
             raise WidgetException("The prerequisites for running this widget have not been met.")
         self.running=True
@@ -457,23 +464,11 @@ class Widget(models.Model):
                         input_dict['wsdl']=self.abstract_widget.wsdl
                         input_dict['wsdl_method']=self.abstract_widget.wsdl_method
                     if self.abstract_widget.has_progress_bar:
-                        if self.abstract_widget.windows_queue:
-                            t = executeWidgetProgressBar.apply_async([self,input_dict],queue="windows")
-                            outputs = t.wait()
-                        else:
-                            outputs = executeWidgetProgressBar(self,input_dict)
+                        outputs = function_to_call(input_dict,self)
                     elif self.abstract_widget.is_streaming:
-                        if self.abstract_widget.windows_queue:
-                            t = executeWidgetStreaming.apply_async([self,input_dict],queue="windows")
-                            outputs = t.wait()
-                        else:
-                            outputs = executeWidgetStreaming(self,input_dict)
+                        outputs = function_to_call(input_dict,self,None)
                     else:
-                        if self.abstract_widget.windows_queue:
-                            t = executeWidgetFunction.apply_async([self,input_dict],queue="windows")
-                            outputs = t.wait()
-                        else:
-                            outputs = executeWidgetFunction(self,input_dict)
+                        outputs = function_to_call(input_dict)
                 else:
                     if self.workflow_link.is_for_loop():
                         self.workflow_link.run_for_loop()
diff --git a/workflows/tasks.py b/workflows/tasks.py
index eb04de7..9e6c8e8 100755
--- a/workflows/tasks.py
+++ b/workflows/tasks.py
@@ -5,7 +5,6 @@ import workflows.library
 def add(a,b):
     import time
     time.sleep(10)
-    raise Exception("test")
     return a+b
 
 @task()
@@ -32,6 +31,11 @@ def executeWidgetWithRequest(widget,input_dict,output_dict,request):
     function_to_call = getattr(workflows.library,widget.abstract_widget.action)
     return function_to_call(request,input_dict,output_dict)
 
+
+@task()
+def runWidget(widget,offline):
+    widget.proper_run(offline)
+
 @task()
 def runWidgetAsync(widget):
     widget.run(True)
\ No newline at end of file
-- 
GitLab