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 2016/01/20 20:55:12 UTC
[1/3] storm git commit: [STORM-1473] enable log search for daemon logs
Repository: storm
Updated Branches:
refs/heads/master 09574884c -> e38d1d782
[STORM-1473] enable log search for daemon logs
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c9cdcbc7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c9cdcbc7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c9cdcbc7
Branch: refs/heads/master
Commit: c9cdcbc76a7b65b03dce09541f2df40a97a6e1fd
Parents: 6fcebe6
Author: zhuol <zh...@yahoo-inc.com>
Authored: Thu Jan 14 11:46:49 2016 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Jan 14 11:46:49 2016 -0600
----------------------------------------------------------------------
.../src/clj/org/apache/storm/daemon/logviewer.clj | 12 +++++++-----
storm-core/src/ui/public/logviewer_search.html | 3 ++-
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c9cdcbc7/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 39a9c12..66a1899 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
@@ -353,10 +353,11 @@
[:a {:href (java.net.URI. url)
:class (str "btn btn-default " (if enabled "enabled" "disabled"))} text])
-(defn search-file-form [fname]
+(defn search-file-form [fname is-daemon]
[[:form {:action "logviewer_search.html" :id "search-box"}
"Search this file:"
[:input {:type "text" :name "search"}]
+ [:input {:type "hidden" :name "is-daemon" :value is-daemon}]
[:input {:type "hidden" :name "file" :value fname}]
[:input {:type "submit" :value "Search"}]]])
@@ -439,7 +440,7 @@
(string/join "\n"))
log-string)])
(let [pager-data (if (is-txt-file fname) (pager-links fname start length file-length) nil)]
- (html (concat (search-file-form fname)
+ (html (concat (search-file-form fname "no")
(log-file-selection-form reordered-files-str "log") ; list all files for this topology
pager-data
(download-link fname)
@@ -483,7 +484,8 @@
(string/join "\n"))
log-string)])
(let [pager-data (if (is-txt-file fname) (pager-links fname start length file-length) nil)]
- (html (concat (log-file-selection-form reordered-files-str "daemonlog") ; list all daemon logs
+ (html (concat (search-file-form fname "yes")
+ (log-file-selection-form reordered-files-str "daemonlog") ; list all daemon logs
pager-data
(daemon-download-link fname)
[[:pre#logContent log-string]]
@@ -1070,7 +1072,7 @@
(catch InvalidRequestException ex
(log-error ex)
(ring-response-from-exception ex))))
- (GET "/search/:file" [:as {:keys [servlet-request servlet-response log-root]} file & m]
+ (GET "/search/:file" [:as {:keys [servlet-request servlet-response log-root daemonlog-root]} file & m]
;; We do not use servlet-response here, but do not remove it from the
;; :keys list, or this rule could stop working when an authentication
;; filter is configured.
@@ -1078,7 +1080,7 @@
(let [user (.getUserName http-creds-handler servlet-request)]
(search-log-file (url-decode file)
user
- log-root
+ (if (= (:is-daemon m) "yes") daemonlog-root log-root)
(:search-string m)
(:num-matches m)
(:start-byte-offset m)
http://git-wip-us.apache.org/repos/asf/storm/blob/c9cdcbc7/storm-core/src/ui/public/logviewer_search.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/logviewer_search.html b/storm-core/src/ui/public/logviewer_search.html
index 670f3fb..f878ab9 100644
--- a/storm-core/src/ui/public/logviewer_search.html
+++ b/storm-core/src/ui/public/logviewer_search.html
@@ -47,6 +47,7 @@ $(document).ready(function() {
var file = $.url("?file");
var search = $.url("?search");
var offset = $.url("?offset") || 0;
+ var isDaemon = $.url("?is-daemon");
file = decodeURIComponent(file);
search = decodeURIComponent(search);
@@ -54,7 +55,7 @@ $(document).ready(function() {
$("#search-form").append(Mustache.render($(template).filter("#search-single-file").html(),{file: file, search: search}));
var result = $("#result");
- var url = "/search/"+encodeURIComponent(file)+"?search-string="+search+"&start-byte-offset="+offset;
+ var url = "/search/"+encodeURIComponent(file)+"?search-string="+search+"&start-byte-offset="+offset+"&is-daemon="+isDaemon;
$.getJSON(url,function(response,status,jqXHR) {
response.file = file;
result.append(Mustache.render($(template).filter("#logviewer-search-result-template").html(),response));
[3/3] storm git commit: Added STORM-1473 to Changelog
Posted by bo...@apache.org.
Added STORM-1473 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e38d1d78
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e38d1d78
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e38d1d78
Branch: refs/heads/master
Commit: e38d1d7829cb290cf0dd22d3193db0f52974506a
Parents: 2e8dcf3
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 20 13:36:06 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 20 13:36:06 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e38d1d78/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b78993..8d4ba1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
* STORM-1484: ignore subproject .classpath & .project file
## 1.0.0
+ * STORM-1473: enable log search for daemon logs
* STORM-1472: Fix the errorTime bug and show the time to be readable
* STORM-1450: Fix minor bugs and refactor code in ResourceAwareScheduler
* STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
[2/3] storm git commit: Merge branch '1473' of
https://github.com/zhuoliu/storm into STORM-1473
Posted by bo...@apache.org.
Merge branch '1473' of https://github.com/zhuoliu/storm into STORM-1473
STORM-1473: enable log search for daemon logs
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2e8dcf34
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2e8dcf34
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2e8dcf34
Branch: refs/heads/master
Commit: 2e8dcf34f51aad35e2d28a2c3a0c22cb49fc6927
Parents: 0957488 c9cdcbc
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 20 13:35:26 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 20 13:35:26 2016 -0600
----------------------------------------------------------------------
.../src/clj/org/apache/storm/daemon/logviewer.clj | 12 +++++++-----
storm-core/src/ui/public/logviewer_search.html | 3 ++-
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------