Repository: storm Updated Branches: refs/heads/master e15dbe281 -> 964188fb7
use configured local hostname for reporting metrics and errors Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a370c167 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a370c167 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a370c167 Branch: refs/heads/master Commit: a370c16780d143eb756c428c4c6a26dac05de5ab Parents: 7602f43 Author: Homer Strong <[email protected]> Authored: Tue Nov 4 08:30:20 2014 -0800 Committer: Homer Strong <[email protected]> Committed: Tue Nov 4 08:30:20 2014 -0800 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/daemon/executor.clj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/a370c167/storm-core/src/clj/backtype/storm/daemon/executor.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj b/storm-core/src/clj/backtype/storm/daemon/executor.clj index f60aa80..a5df9cc 100644 --- a/storm-core/src/clj/backtype/storm/daemon/executor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj @@ -176,7 +176,8 @@ (when (<= @interval-errors max-per-interval) (cluster/report-error (:storm-cluster-state executor) (:storm-id executor) (:component-id executor) - (memoized-local-hostname) (.getThisWorkerPort (:worker-context executor)) error) + (:storm-conf STORM-LOCAL-HOSTNAME (memoized-local-hostname)) + (.getThisWorkerPort (:worker-context executor)) error) )))) ;; in its own function so that it can be mocked out by tracked topologies @@ -278,7 +279,8 @@ task-id (:task-id task-data) name->imetric (-> interval->task->metric-registry (get interval) (get task-id)) task-info (IMetricsConsumer$TaskInfo. - (memoized-local-hostname) + (get-in executor-data [:storm-conf STORM-LOCAL-HOSTNAME] + (memoized-local-hostname)) (.getThisWorkerPort worker-context) (:component-id executor-data) task-id
