You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2015/10/15 16:05:42 UTC
incubator-slider git commit: SLIDER-929 Fix test_signal_handler
failure (Thomas Liu via gourksaha)
Repository: incubator-slider
Updated Branches:
refs/heads/develop 66af973c3 -> 342061f7c
SLIDER-929 Fix test_signal_handler failure (Thomas Liu via gourksaha)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/342061f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/342061f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/342061f7
Branch: refs/heads/develop
Commit: 342061f7ca5afb55f172b8d4a432497a8f8b2560
Parents: 66af973
Author: Gour Saha <go...@apache.org>
Authored: Thu Oct 15 07:05:34 2015 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Thu Oct 15 07:05:34 2015 -0700
----------------------------------------------------------------------
slider-agent/src/main/python/agent/main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/342061f7/slider-agent/src/main/python/agent/main.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/main/python/agent/main.py b/slider-agent/src/main/python/agent/main.py
index e6a4790..bfd4a27 100644
--- a/slider-agent/src/main/python/agent/main.py
+++ b/slider-agent/src/main/python/agent/main.py
@@ -55,7 +55,7 @@ def signal_handler(signum, frame):
os._exit(0)
logger.info('signal received, exiting.')
global controller
- if controller is not None:
+ if controller is not None and hasattr(controller, 'actionQueue'):
tmpdir = controller.actionQueue.dockerManager.stop_container()
ProcessHelper.stopAgent()