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/06/06 18:13:30 UTC
[1/3] git commit: Removed log-level-page
Repository: incubator-storm
Updated Branches:
refs/heads/master 6dae731c8 -> 3dd27a0b9
Removed log-level-page
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/98809b58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/98809b58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/98809b58
Branch: refs/heads/master
Commit: 98809b58af1b6b2a47322ef1994a8585d630c965
Parents: b612a86
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed May 7 13:48:16 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed May 7 13:48:16 2014 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/98809b58/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 2a48f55..4903b4d 100644
--- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
@@ -20,10 +20,7 @@
(:use [ring.adapter.jetty :only [run-jetty]])
(:import [org.slf4j LoggerFactory])
(:import [ch.qos.logback.classic Logger])
- (:import [org.apache.commons.logging LogFactory])
- (:import [org.apache.commons.logging.impl Log4JLogger])
(:import [ch.qos.logback.core FileAppender])
- (:import [org.apache.log4j Level])
(:import [java.io File])
(:require [compojure.route :as route]
[compojure.handler :as handler]
@@ -70,13 +67,6 @@ Note that if anything goes wrong, this will throw an Error and exit."
(filter #(.contains % grep) (.split tail-string "\n")))
(.replaceAll tail-string "\n" "\n<br>"))))
-(defn log-level-page [name level]
- (let [log (LogFactory/getLog name)]
- (if level
- (if (instance? Log4JLogger log)
- (.setLevel (.getLogger log) (Level/toLevel level))))
- (str "effective log level for " name " is " (.getLevel (.getLogger log)))))
-
(defn log-template [body]
(html4
[:head
@@ -95,8 +85,6 @@ Note that if anything goes wrong, this will throw an Error and exit."
(defroutes log-routes
(GET "/log" [:as req & m]
(log-template (log-page (:file m) (:tail m) (:grep m) (:log-root req))))
- (GET "/loglevel" [:as {cookies :cookies} & m]
- (log-template (log-level-page (:name m) (:level m))))
(route/resources "/")
(route/not-found "Page not found"))
[3/3] git commit: Added STORM-313 to Changelog.
Posted by bo...@apache.org.
Added STORM-313 to Changelog.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/3dd27a0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/3dd27a0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/3dd27a0b
Branch: refs/heads/master
Commit: 3dd27a0b95afecca313783ad8e329db8bcca7f1a
Parents: 0d47c51
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Jun 6 11:00:11 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Jun 6 11:00:11 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/3dd27a0b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2117367..463489f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-313: Remove log-level-page from logviewer
* STORM-205: Add REST API To Storm UI
* STORM-326: tasks send duplicate metrics
* STORM-331: Update the Kafka dependency of storm-kafka to 0.8.1.1
[2/3] git commit: Merge branch 'rm-log-level-page' of
https://github.com/revans2/incubator-storm into STORM-313
Posted by bo...@apache.org.
Merge branch 'rm-log-level-page' of https://github.com/revans2/incubator-storm into STORM-313
STORM-313: Remove log-level-page from logviewer
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/0d47c513
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/0d47c513
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/0d47c513
Branch: refs/heads/master
Commit: 0d47c5136744e438f11bbc377adf61f7329c84e5
Parents: 6dae731 98809b5
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Jun 6 10:56:42 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Jun 6 10:56:42 2014 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------