You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/08/31 22:46:34 UTC
[1/3] storm git commit: [STORM-2056] - Bugs in logviewer
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch b314ee2ff -> ab564bbb9
[STORM-2056] - Bugs in logviewer
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/972afab2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/972afab2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/972afab2
Branch: refs/heads/1.0.x-branch
Commit: 972afab2dea0c8d6246fce0a3552b16c45aa80c2
Parents: b314ee2
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Tue Aug 30 15:38:05 2016 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Sep 1 07:46:01 2016 +0900
----------------------------------------------------------------------
.../clj/org/apache/storm/daemon/logviewer.clj | 29 +++++++++++---------
1 file changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/972afab2/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 fec313b..1ad88f9 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
@@ -367,27 +367,27 @@
(drop-down "file" log-files)
[:input {:type "submit" :value "Switch file"}]]])
-(defn pager-links [fname start length file-size]
+(defn pager-links [fname start length file-size type]
(let [prev-start (max 0 (- start length))
next-start (if (> file-size 0)
(min (max 0 (- file-size length)) (+ start length))
(+ start length))]
[[:div
(concat
- [(to-btn-link (url "/log"
+ [(to-btn-link (url (str "/" type)
{:file fname
:start (max 0 (- start length))
:length length})
"Prev" :enabled (< prev-start start))]
- [(to-btn-link (url "/log"
+ [(to-btn-link (url (str "/" type)
{:file fname
:start 0
:length length}) "First")]
- [(to-btn-link (url "/log"
+ [(to-btn-link (url (str "/" type)
{:file fname
:length length})
"Last")]
- [(to-btn-link (url "/log"
+ [(to-btn-link (url (str "/" type)
{:file fname
:start (min (max 0 (- file-size length))
(+ start length))
@@ -440,7 +440,7 @@
(filter #(.contains % grep))
(string/join "\n"))
log-string)])
- (let [pager-data (if (is-txt-file fname) (pager-links fname start length file-length) nil)]
+ (let [pager-data (if (is-txt-file fname) (pager-links fname start length file-length "log") nil)]
(html (concat (search-file-form fname "no")
(log-file-selection-form reordered-files-str "log") ; list all files for this topology
pager-data
@@ -484,7 +484,7 @@
(filter #(.contains % grep))
(string/join "\n"))
log-string)])
- (let [pager-data (if (is-txt-file fname) (pager-links fname start length file-length) nil)]
+ (let [pager-data (if (is-txt-file fname) (pager-links fname start length file-length "daemonlog") nil)]
(html (concat (search-file-form fname "yes")
(log-file-selection-form reordered-files-str "daemonlog") ; list all daemon logs
pager-data
@@ -494,11 +494,13 @@
(-> (resp/response "Page not found")
(resp/status 404)))))
-(defn download-log-file [fname req resp user ^String root-dir]
+(defnk download-log-file [fname req resp user ^String root-dir :is-daemon false]
(let [file (.getCanonicalFile (File. root-dir fname))]
(if (.exists file)
- (if (or (blank? (*STORM-CONF* UI-FILTER))
- (authorized-log-user? user fname *STORM-CONF*))
+
+ (if (or is-daemon
+ (or (blank? (*STORM-CONF* UI-FILTER))
+ (authorized-log-user? user fname *STORM-CONF*)))
(-> (resp/response file)
(resp/content-type "application/octet-stream"))
(unauthorized-user-html user))
@@ -818,8 +820,9 @@
[fname user ^String root-dir is-daemon search num-matches offset callback origin]
(let [file (.getCanonicalFile (File. root-dir fname))]
(if (.exists file)
- (if (or (blank? (*STORM-CONF* UI-FILTER))
- (authorized-log-user? user fname *STORM-CONF*))
+ (if (or is-daemon
+ (or (blank? (*STORM-CONF* UI-FILTER))
+ (authorized-log-user? user fname *STORM-CONF*)))
(let [num-matches-int (if num-matches
(try-parse-int-param "num-matches"
num-matches))
@@ -1094,7 +1097,7 @@
(try
(mark! logviewer:num-download-log-daemon-file-http-requests)
(let [user (.getUserName http-creds-handler servlet-request)]
- (download-log-file file servlet-request servlet-response user daemonlog-root))
+ (download-log-file file servlet-request servlet-response user daemonlog-root :is-daemon true))
(catch InvalidRequestException ex
(log-error ex)
(ring-response-from-exception ex))))
[2/3] storm git commit: Merge branch 'STORM-2056-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2056-1.0.x' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8520d8fa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8520d8fa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8520d8fa
Branch: refs/heads/1.0.x-branch
Commit: 8520d8faad6557211f32cc0fc140c7120bbcbf94
Parents: b314ee2 972afab
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Sep 1 07:46:06 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Sep 1 07:46:06 2016 +0900
----------------------------------------------------------------------
.../clj/org/apache/storm/daemon/logviewer.clj | 29 +++++++++++---------
1 file changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-2056 to CHANGELOG
Posted by ka...@apache.org.
add STORM-2056 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ab564bbb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ab564bbb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ab564bbb
Branch: refs/heads/1.0.x-branch
Commit: ab564bbb9e51760cc1bb26afafd25e4082f6fa42
Parents: 8520d8f
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Sep 1 07:46:21 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Sep 1 07:46:21 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ab564bbb/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c4b5a5..7790df9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2056: Bugs in logviewer
* STORM-1646: Fix ExponentialBackoffMsgRetryManager test
* STORM-2039: Backpressure refactoring in worker and executor
* STORM-2064: Add storm name and function, access result and function to log-thrift-access