use new hostname util consistently in daemons
diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj b/storm-core/src/clj/backtype/storm/daemon/executor.clj
index a5df9cc..63428d5 100644
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@ -176,7 +176,7 @@
(when (<= @interval-errors max-per-interval)
(cluster/report-error (:storm-cluster-state executor) (:storm-id executor) (:component-id executor)
- (:storm-conf STORM-LOCAL-HOSTNAME (memoized-local-hostname))
+ (hostname storm-conf)
(.getThisWorkerPort (:worker-context executor)) error)
))))
@@ -279,8 +279,7 @@
task-id (:task-id task-data)
name->imetric (-> interval->task->metric-registry (get interval) (get task-id))
task-info (IMetricsConsumer$TaskInfo.
- (get-in executor-data [:storm-conf STORM-LOCAL-HOSTNAME]
- (memoized-local-hostname))
+ (hostname (:storm-conf executor-data))
(.getThisWorkerPort worker-context)
(:component-id executor-data)
task-id
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index b370eb7..71f9bfb 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -212,9 +212,7 @@
:local-state (supervisor-state conf)
:supervisor-id (.getSupervisorId isupervisor)
:assignment-id (.getAssignmentId isupervisor)
- :my-hostname (if (contains? conf STORM-LOCAL-HOSTNAME)
- (conf STORM-LOCAL-HOSTNAME)
- (local-hostname))
+ :my-hostname (hostname conf)
:curr-assignment (atom nil) ;; used for reporting used ports when heartbeating
:timer (mk-timer :kill-fn (fn [t]
(log-error t "Error when processing event")
