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 2014/12/23 19:00:52 UTC
[2/5] storm git commit: fix for lazy evaluation of log string
fix for lazy evaluation of log string
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/23271cce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/23271cce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/23271cce
Branch: refs/heads/master
Commit: 23271ccee2ad74a055e56021c336d6471c6c26e8
Parents: 4f5f7bf
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Sep 23 13:50:55 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Sep 23 14:03:59 2014 -0500
----------------------------------------------------------------------
.../src/clj/backtype/storm/daemon/logviewer.clj | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/23271cce/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 528a156..2f3528e 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -124,18 +124,17 @@
(defn cleanup-fn! [log-root-dir]
(let [now-secs (current-time-secs)
old-log-files (select-files-for-cleanup *STORM-CONF* (* now-secs 1000) log-root-dir)
- owner->files (get-dead-worker-files-and-owners *STORM-CONF*
- now-secs
- old-log-files
- log-root-dir)]
+ dead-worker-files (get-dead-worker-files-and-owners *STORM-CONF* now-secs old-log-files log-root-dir)]
(log-debug "log cleanup: now(" now-secs
- ") old log files (" (mapcat #(.getName %) old-log-files)
- ") dead worker files (" (mapcat #(for [{f :files} %
- :when f]
- (.getName f))
- owner->files)
+ ") old log files (" (->> old-log-files
+ (map #(.getName %))
+ (string/join ","))
+ ") dead worker files (" (->> dead-worker-files
+ (mapcat (fn [{l :files}] l))
+ (map #(.getName %))
+ (string/join ","))
")")
- (dofor [{:keys [owner files]} owner->files
+ (dofor [{:keys [owner files]} dead-worker-files
file files]
(let [path (.getCanonicalPath file)]
(log-message "Cleaning up: Removing " path)