Repository: storm Updated Branches: refs/heads/1.0.x-branch 85b4c93fb -> f065bcb80
STORM-2325 Logviewer doesn't consider 'storm.local.hostname' * consider storm.local.hostname first for creating link url in Logviewer Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/919d63f5 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/919d63f5 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/919d63f5 Branch: refs/heads/1.0.x-branch Commit: 919d63f5e225757d3589488d13498ef24daaacc8 Parents: 85b4c93 Author: Jungtaek Lim <[email protected]> Authored: Wed Jan 25 18:20:19 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon Jan 30 22:40:02 2017 +0900 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/daemon/logviewer.clj | 4 ++-- storm-core/src/jvm/org/apache/storm/utils/Utils.java | 9 +++++++-- storm-core/test/clj/org/apache/storm/logviewer_test.clj | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/919d63f5/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj index 9b96c86..a5b2ee8 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj @@ -518,7 +518,7 @@ (defn url-to-match-centered-in-log-page [needle fname offset port] - (let [host (local-hostname) + (let [host (hostname) port (logviewer-port) fname (clojure.string/join file-path-separator (take-last 3 (split fname (re-pattern file-path-separator))))] (url (str "http://"; host ":" port "/log") @@ -531,7 +531,7 @@ (defn url-to-match-centered-in-log-page-daemon-file [needle fname offset port] - (let [host (local-hostname) + (let [host (hostname) port (logviewer-port) fname (clojure.string/join file-path-separator (take-last 1 (split fname (re-pattern file-path-separator))))] (url (str "http://"; host ":" port "/daemonlog") http://git-wip-us.apache.org/repos/asf/storm/blob/919d63f5/storm-core/src/jvm/org/apache/storm/utils/Utils.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/utils/Utils.java b/storm-core/src/jvm/org/apache/storm/utils/Utils.java index 0fe0935..661c12c 100644 --- a/storm-core/src/jvm/org/apache/storm/utils/Utils.java +++ b/storm-core/src/jvm/org/apache/storm/utils/Utils.java @@ -1723,8 +1723,13 @@ public class Utils { * Gets the storm.local.hostname value, or tries to figure out the local hostname * if it is not set in the config. * @return a string representation of the hostname. - */ - public static String hostname () throws UnknownHostException { + */ + public static String hostname() throws UnknownHostException { + return _instance.hostnameImpl(); + } + + // Non-static impl methods exist for mocking purposes. + protected String hostnameImpl () throws UnknownHostException { if (localConf == null) { return memoizedLocalHostname(); } http://git-wip-us.apache.org/repos/asf/storm/blob/919d63f5/storm-core/test/clj/org/apache/storm/logviewer_test.clj ---------------------------------------------------------------------- diff --git a/storm-core/test/clj/org/apache/storm/logviewer_test.clj b/storm-core/test/clj/org/apache/storm/logviewer_test.clj index aae76e6..376ce32 100644 --- a/storm-core/test/clj/org/apache/storm/logviewer_test.clj +++ b/storm-core/test/clj/org/apache/storm/logviewer_test.clj @@ -371,7 +371,7 @@ ;; match. exp-offset-fn #(- (/ logviewer/default-bytes-per-page 2) %)] - (stubbing [local-hostname expected-host + (stubbing [hostname expected-host logviewer/logviewer-port expected-port] (testing "Logviewer link centers the match in the page"
