storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [1/2] storm git commit: Merge branch 'STORM-977' of https://github.com/gliptak/storm
Date Thu, 13 Aug 2015 16:54:15 GMT
Repository: storm
Updated Branches:
  refs/heads/0.10.x-branch 28d7e69d5 -> 02d9b836b


Merge branch 'STORM-977' of https://github.com/gliptak/storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1c590e16
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1c590e16
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1c590e16

Branch: refs/heads/0.10.x-branch
Commit: 1c590e1667d1f3d6ff89c4368441dfe322a640e0
Parents: 28d7e69
Author: Derek Dagit <derekd@yahoo-inc.com>
Authored: Thu Aug 13 11:30:51 2015 -0500
Committer: Derek Dagit <derekd@yahoo-inc.com>
Committed: Thu Aug 13 11:50:04 2015 -0500

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/1c590e16/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 2b19596..87a2d3f 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -262,7 +262,7 @@
       (psim/kill-process thread-pid))
     (doseq [pid pids]
       (if as-user
-        (worker-launcher-and-wait conf user ["signal" pid "9"] :log-prefix (str "kill -15
" pid))
+        (worker-launcher-and-wait conf user ["signal" pid "15"] :log-prefix (str "kill -15
" pid))
         (kill-process-with-sig-term pid)))
     (when-not (empty? pids)  
       (log-message "Sleep " shutdown-sleep-secs " seconds for execution of cleanup threads
on worker.")


Mime
View raw message