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/06/30 15:24:22 UTC
[2/4] storm git commit: Adding boolean condition so logviewer HTTPS
is not necessary.
Adding boolean condition so logviewer HTTPS is not necessary.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1da96361
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1da96361
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1da96361
Branch: refs/heads/master
Commit: 1da96361b133029444a632bf2624226eb26f566d
Parents: 0bc4565
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Mon Jun 29 11:31:22 2015 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Jun 29 11:31:22 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 2 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1da96361/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
index aa9e7c1..e77527b 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -370,7 +370,7 @@ Note that if anything goes wrong, this will throw an Error and exit."
[{:filter-class "org.eclipse.jetty.servlets.GzipFilter"
:filter-name "Gzipper"
:filter-params {}}])
- https-port (int (conf LOGVIEWER-HTTPS-PORT))
+ https-port (int (or (conf LOGVIEWER-HTTPS-PORT) 0))
keystore-path (conf LOGVIEWER-HTTPS-KEYSTORE-PATH)
keystore-pass (conf LOGVIEWER-HTTPS-KEYSTORE-PASSWORD)
keystore-type (conf LOGVIEWER-HTTPS-KEYSTORE-TYPE)
http://git-wip-us.apache.org/repos/asf/storm/blob/1da96361/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index aa2d01d..b0e266c 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -295,7 +295,7 @@
(defn worker-log-link [host port topology-id secure?]
(let [fname (logs-filename topology-id port)]
- (if secure?
+ (if (and secure? (*STORM-CONF* LOGVIEWER-HTTPS-PORT))
(url-format "https://%s:%s/log?file=%s"
host
(*STORM-CONF* LOGVIEWER-HTTPS-PORT)