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/02/03 18:10:02 UTC
[1/4] storm git commit: STORM-635. logviewer returns 404 if
storm_home/logs is a symlinked dir.
Repository: storm
Updated Branches:
refs/heads/master a9cdaf0c7 -> bbcf749ca
STORM-635. logviewer returns 404 if storm_home/logs is a symlinked dir.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bf9a3118
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bf9a3118
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bf9a3118
Branch: refs/heads/master
Commit: bf9a311848de6ac2abf5cbbe987953b120fd813c
Parents: bc54e8e
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Wed Jan 21 17:45:14 2015 -0800
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Wed Jan 21 17:45:14 2015 -0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bf9a3118/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 6fbabbd..f55a2d5 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -258,8 +258,7 @@ Note that if anything goes wrong, this will throw an Error and exit."
(let [file (.getCanonicalFile (File. root-dir fname))
file-length (.length file)
path (.getCanonicalPath file)]
- (if (= (File. root-dir)
- (.getParentFile file))
+ (if (.exists file)
(let [default-length 51200
length (if length
(min 10485760 length)
[3/4] storm git commit: Merge branch 'STORM-635' of
https://github.com/harshach/incubator-storm into STORM-635
Posted by bo...@apache.org.
Merge branch 'STORM-635' of https://github.com/harshach/incubator-storm into STORM-635
STORM-635: logviewer returns 404 if storm_home/logs is a symlinked dir.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4abc6b5d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4abc6b5d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4abc6b5d
Branch: refs/heads/master
Commit: 4abc6b5d343b2cc11403badb81dbed57c4795d7c
Parents: a9cdaf0 516097e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Feb 3 11:00:25 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Feb 3 11:00:25 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/4] storm git commit: STORM-635. logviewer returns 404 if
storm_home/logs is a symlinked dir.
Posted by bo...@apache.org.
STORM-635. logviewer returns 404 if storm_home/logs is a symlinked dir.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/516097ef
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/516097ef
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/516097ef
Branch: refs/heads/master
Commit: 516097efc72c79f2bad28585f413a78c10c6c9d5
Parents: bf9a311
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Jan 22 10:35:41 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Jan 22 10:35:41 2015 -0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/516097ef/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 f55a2d5..f2a5b0a 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -258,7 +258,9 @@ Note that if anything goes wrong, this will throw an Error and exit."
(let [file (.getCanonicalFile (File. root-dir fname))
file-length (.length file)
path (.getCanonicalPath file)]
- (if (.exists file)
+ (if (and (= (.getCanonicalFile (File. root-dir))
+ (.getParentFile file))
+ (.exists file))
(let [default-length 51200
length (if length
(min 10485760 length)
[4/4] storm git commit: Added STORM-635 to Changelog
Posted by bo...@apache.org.
Added STORM-635 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bbcf749c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bbcf749c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bbcf749c
Branch: refs/heads/master
Commit: bbcf749ca3c2557fabfc07db573e6d43eaf63d36
Parents: 4abc6b5
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Feb 3 11:09:24 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Feb 3 11:09:24 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bbcf749c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09a34af..cbdc314 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
* STORM-632: New grouping for better load balancing
* STORM-527: update worker.clj -- delete "missing-tasks" checking
* STORM-623: Generate latest javadocs
+ * STORM-635. logviewer returns 404 if storm_home/logs is a symlinked dir.
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor