storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srihar...@apache.org
Subject [1/3] storm git commit: return grep matches each on its own line
Date Sun, 08 Mar 2015 18:02:58 GMT
Repository: storm
Updated Branches:
  refs/heads/master 9517923b1 -> 30a013021


return grep matches each on its own line


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4f468d91
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4f468d91
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4f468d91

Branch: refs/heads/master
Commit: 4f468d91494811f22f82154698317e7ed7cabf29
Parents: be64b25
Author: Derek Dagit <derekd@yahoo-inc.com>
Authored: Fri Feb 6 17:47:06 2015 -0600
Committer: Derek Dagit <derekd@yahoo-inc.com>
Committed: Fri Feb 6 17:47:06 2015 -0600

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/4f468d91/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 f2a5b0a..7af1d5d 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -273,8 +273,9 @@ Note that if anything goes wrong, this will throw an Error and exit."
           (if grep
             (html [:pre#logContent
                    (if grep
-                     (filter #(.contains % grep)
-                             (.split log-string "\n"))
+                     (->> (.split log-string "\n")
+                          (filter #(.contains % grep))
+                          (string/join "\n"))
                      log-string)])
             (let [pager-data (pager-links fname start length file-length)]
               (html (concat pager-data


Mime
View raw message