From 990dbb0201b5a3630f4e326e4889ae5b91b4dd32 Mon Sep 17 00:00:00 2001 From: Calvin Date: Fri, 13 Apr 2012 23:56:24 +0800 Subject: [PATCH] =?UTF-8?q?#20=20log4j=E5=8A=A8=E6=80=81=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examples/showcase/log/LogController.java | 108 ++++++++++++++++++ .../src/main/webapp/WEB-INF/layouts/left.jsp | 3 +- .../main/webapp/WEB-INF/views/log/console.jsp | 41 +++++++ .../WEB-INF/views/story/executablewar.jsp | 8 +- .../springside/modules/log/Log4jManager.java | 10 +- 5 files changed, 164 insertions(+), 6 deletions(-) create mode 100644 examples/showcase/src/main/java/org/springside/examples/showcase/log/LogController.java create mode 100644 examples/showcase/src/main/webapp/WEB-INF/views/log/console.jsp diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/log/LogController.java b/examples/showcase/src/main/java/org/springside/examples/showcase/log/LogController.java new file mode 100644 index 00000000..84378f6e --- /dev/null +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/log/LogController.java @@ -0,0 +1,108 @@ +package org.springside.examples.showcase.log; + +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springside.modules.log.Log4jManager; + +import com.google.common.collect.Lists; + +@Controller +@RequestMapping("/log") +public class LogController { + + private List levels = Lists.newArrayList("", "ERROR", "WARN", "INFO"); + + @Autowired + private Log4jManager log4jManager; + + @RequestMapping(value = "/console") + public String console(Model model) { + + createFormObject(model); + + return "log/console"; + } + + @RequestMapping(value = "/defaultsetting") + public String updateDefaultLogger(FormObject command, Model model) { + log4jManager.setRootLoggerLevel(command.getRootLoggerLevel()); + log4jManager.setProjectLoggerLevel(command.getProjectLoggerLevel()); + + createFormObject(model); + + return "log/console"; + } + + @RequestMapping(value = "/loggersetting") + public String updateLogger(FormObject command, Model model) { + String loggerName = command.loggerName; + String loggerLevel = null; + if (StringUtils.isNotBlank(command.loggerLevel)) { + loggerLevel = command.loggerLevel; + log4jManager.setLoggerLevel(command.loggerName, command.loggerLevel); + + } else { + loggerLevel = log4jManager.getLoggerLevel(command.loggerName); + } + + FormObject newCommand = createFormObject(model); + newCommand.loggerName = loggerName; + newCommand.loggerLevel = loggerLevel; + return "log/console"; + } + + private FormObject createFormObject(Model model) { + FormObject command = new FormObject(); + command.rootLoggerLevel = log4jManager.getRootLoggerLevel(); + command.projectLoggerLevel = log4jManager.getProjectLoggerLevel(); + model.addAttribute("command", command); + + model.addAttribute("levels", levels); + return command; + } + + public static class FormObject { + private String rootLoggerLevel; + private String projectLoggerLevel; + private String loggerName; + private String loggerLevel; + + public String getRootLoggerLevel() { + return rootLoggerLevel; + } + + public String getProjectLoggerLevel() { + return projectLoggerLevel; + } + + public String getLoggerName() { + return loggerName; + } + + public String getLoggerLevel() { + return loggerLevel; + } + + public void setRootLoggerLevel(String rootLoggerLevel) { + this.rootLoggerLevel = rootLoggerLevel; + } + + public void setProjectLoggerLevel(String projectLoggerLevel) { + this.projectLoggerLevel = projectLoggerLevel; + } + + public void setLoggerName(String loggerName) { + this.loggerName = loggerName; + } + + public void setLoggerLevel(String loggerLevel) { + this.loggerLevel = loggerLevel; + } + + } +} diff --git a/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp b/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp index fe0df2cd..646b0426 100644 --- a/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp +++ b/examples/showcase/src/main/webapp/WEB-INF/layouts/left.jsp @@ -11,9 +11,10 @@ 安全演示 Web演示 WebService演示 + 日志控制演示 JMX演示 可运行war包演示 - Utilizes演示 + 工具类演示 登录 diff --git a/examples/showcase/src/main/webapp/WEB-INF/views/log/console.jsp b/examples/showcase/src/main/webapp/WEB-INF/views/log/console.jsp new file mode 100644 index 00000000..30007c52 --- /dev/null +++ b/examples/showcase/src/main/webapp/WEB-INF/views/log/console.jsp @@ -0,0 +1,41 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + +邮件演示 + + + +

Log4j控制頁面

+ + +
+ +
+
+ +
+
+ +
+
+ + +
+ +
+
+ + + + + + + +
+
+ + \ No newline at end of file diff --git a/examples/showcase/src/main/webapp/WEB-INF/views/story/executablewar.jsp b/examples/showcase/src/main/webapp/WEB-INF/views/story/executablewar.jsp index d251a701..e1742418 100644 --- a/examples/showcase/src/main/webapp/WEB-INF/views/story/executablewar.jsp +++ b/examples/showcase/src/main/webapp/WEB-INF/views/story/executablewar.jsp @@ -9,13 +9,15 @@

技术说明:

用户故事:

\ No newline at end of file diff --git a/modules/core/src/main/java/org/springside/modules/log/Log4jManager.java b/modules/core/src/main/java/org/springside/modules/log/Log4jManager.java index eeabd925..554be39f 100644 --- a/modules/core/src/main/java/org/springside/modules/log/Log4jManager.java +++ b/modules/core/src/main/java/org/springside/modules/log/Log4jManager.java @@ -51,7 +51,11 @@ public class Log4jManager { */ @ManagedAttribute(description = "Project default logging level of the logger") public String getProjectLoggerLevel() { - return getLoggerLevel(projectLoggerName); + if (projectLoggerName != null) { + return getLoggerLevel(projectLoggerName); + } + + return null; } /** @@ -60,7 +64,9 @@ public class Log4jManager { */ @ManagedAttribute(description = "Project default logging level of the logger") public void setProjectLoggerLevel(String newLevel) { - setLoggerLevel(projectLoggerName, newLevel); + if (projectLoggerName != null) { + setLoggerLevel(projectLoggerName, newLevel); + } } /**