Merge pull request #51 from pbenas/oom

BUGFIX: check plugin still alive
gooddata · Apr 25, 2016 · 61f4d0e · 61f4d0e
2 parents 4dd84ea + 4be5c0d
commit 61f4d0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 # Parameters for build
 params = {
     'name': name,
-    'version': '2.1.3',
+    'version': '2.1.4',
     'packages': [
         'smoker',
         'smoker.server',

diff --git a/smoker.spec b/smoker.spec
@@ -1,7 +1,7 @@
 %global with_check 0
 
 Name:		smoker
-Version:	2.1.3
+Version:	2.1.4
 Release:	1%{?dist}
 Epoch:		1
 Summary:	Smoke Testing Framework

diff --git a/smoker/server/plugins/__init__.py b/smoker/server/plugins/__init__.py
@@ -376,7 +376,10 @@ def run(self):
         Check if plugin should be run and execute it
         """
         if self.current_run:  # already running
-            return
+            if self.current_run.is_alive():
+                return
+            self.current_run.join()
+
         # Plugin run when forced
         if self.forced:
             self.current_run = PluginWorker(self.name, self.queue, self.params,