You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/11/24 18:57:20 UTC

[13/16] storm git commit: use storm-conf instead of conf

use storm-conf instead of conf


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

Branch: refs/heads/master
Commit: 9bc9350f613a75de566cf670874c6a037ecc5bfd
Parents: ccb8031
Author: Michael Schonfeld <mi...@schonfeld.org>
Authored: Mon Nov 23 15:15:01 2015 -0500
Committer: Michael Schonfeld <mi...@schonfeld.org>
Committed: Mon Nov 23 18:50:55 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/storm/blob/9bc9350f/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index 64670c2..d978315 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -551,7 +551,7 @@
 
 (defn run-worker-start-hooks [worker]
   (let [topology (:topology worker)
-        topo-conf (:conf worker)
+        topo-conf (:storm-conf worker)
         worker-topology-context (worker-context worker)
         hooks (.get_worker_hooks topology)]
     (dofor [hook hooks]