Repository: storm Updated Branches: refs/heads/master 1811273f1 -> 69568ecf0
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/ab539770 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ab539770 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ab539770 Branch: refs/heads/master Commit: ab539770ae4a7ac96335ff90e12a35b735af2cf0 Parents: 1811273 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Wed Jan 25 18:20:19 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Wed Jan 25 18:20:19 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/ab539770/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 b697dd8..284a237 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj @@ -529,7 +529,7 @@ (defn url-to-match-centered-in-log-page [needle fname offset port] - (let [host (Utils/localHostname) + (let [host (Utils/hostname) port (logviewer-port) fname (clojure.string/join Utils/FILE_PATH_SEPARATOR (take-last 3 (split fname (re-pattern Utils/FILE_PATH_SEPARATOR))))] (url (str "http://"; host ":" port "/log") @@ -542,7 +542,7 @@ (defn url-to-match-centered-in-log-page-daemon-file [needle fname offset port] - (let [host (Utils/localHostname) + (let [host (Utils/hostname) port (logviewer-port) fname (clojure.string/join Utils/FILE_PATH_SEPARATOR (take-last 1 (split fname (re-pattern Utils/FILE_PATH_SEPARATOR))))] (url (str "http://"; host ":" port "/daemonlog") http://git-wip-us.apache.org/repos/asf/storm/blob/ab539770/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 4610908..a430336 100644 --- a/storm-core/src/jvm/org/apache/storm/utils/Utils.java +++ b/storm-core/src/jvm/org/apache/storm/utils/Utils.java @@ -1771,8 +1771,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/ab539770/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 027e848..2ec9304 100644 --- a/storm-core/test/clj/org/apache/storm/logviewer_test.clj +++ b/storm-core/test/clj/org/apache/storm/logviewer_test.clj @@ -380,7 +380,7 @@ (stubbing [logviewer/logviewer-port expected-port] (with-open [_ (UtilsInstaller. (proxy [Utils] [] - (localHostnameImpl [] expected-host)))] + (hostnameImpl [] expected-host)))] (testing "Logviewer link centers the match in the page" (let [expected-fname "foobar.log"] (is (= (str "http://";
