From be1d351d3d4601c3fbae5d6475d3d1d11d7785b8 Mon Sep 17 00:00:00 2001 From: Calvin Date: Thu, 27 Dec 2012 22:11:45 +0800 Subject: [PATCH] =?UTF-8?q?#144=20=E4=BB=8E=20log4j=E8=BD=AC=E4=B8=BAlogba?= =?UTF-8?q?ck=EF=BC=8C=E4=BF=AE=E6=AD=A3logback=E7=9A=84layout=E5=92=8Capp?= =?UTF-8?q?ender=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quickstart/rest/TaskRestController.java | 5 ++ .../quickstart/src/main/resources/logback.xml | 51 ++++++++-------- .../showcase/src/main/resources/logback.xml | 61 +++++++++++-------- modules/core/src/test/resources/logback.xml | 6 +- .../extension/src/test/resources/logback.xml | 6 +- .../modules/test/log/LogbackMockAppender.java | 16 +++++ modules/test/src/test/resources/logback.xml | 6 +- 7 files changed, 91 insertions(+), 60 deletions(-) diff --git a/examples/quickstart/src/main/java/org/springside/examples/quickstart/rest/TaskRestController.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/rest/TaskRestController.java index a60ff664..897ee04b 100644 --- a/examples/quickstart/src/main/java/org/springside/examples/quickstart/rest/TaskRestController.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/rest/TaskRestController.java @@ -5,6 +5,8 @@ import java.util.List; import javax.validation.Validator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -31,6 +33,8 @@ import org.springside.modules.beanvalidator.BeanValidators; @RequestMapping(value = "/api/v1/task") public class TaskRestController { + Logger logger = LoggerFactory.getLogger(TaskRestController.class); + @Autowired private TaskService taskService; @@ -48,6 +52,7 @@ public class TaskRestController { public ResponseEntity get(@PathVariable("id") Long id) { Task task = taskService.getTask(id); if (task == null) { + logger.warn("task with id {} not found", id); return new ResponseEntity(HttpStatus.NOT_FOUND); } return new ResponseEntity(task, HttpStatus.OK); diff --git a/examples/quickstart/src/main/resources/logback.xml b/examples/quickstart/src/main/resources/logback.xml index 0abee3a8..dc4bdb1b 100644 --- a/examples/quickstart/src/main/resources/logback.xml +++ b/examples/quickstart/src/main/resources/logback.xml @@ -1,27 +1,30 @@ - - - - %d [%t] %-5p [%c] - %m%n - - - - - logs/quickstart.log - - %d [%t] %-5p [%c] - %m%n - - - - - - - - - - - - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + logs/quickstart.log + + logs/quickstart.%d{yyyy-MM-dd}.log + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/showcase/src/main/resources/logback.xml b/examples/showcase/src/main/resources/logback.xml index fb8b27a2..ac1668df 100644 --- a/examples/showcase/src/main/resources/logback.xml +++ b/examples/showcase/src/main/resources/logback.xml @@ -1,30 +1,37 @@ - - - - - %d [%t] %-5p [%-40.40c] -%m%n - - - - - - .yyyy-MM-dd-HH - logs/showcase.log - - %d [%t] %-5p [%-40.40c] -%m%n - - - - - - - - - - - - - + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + logs/showcase.log + + + logs/showcase-%d{yyyy-MM-dd_HH}.%i.zip + 300 + + 10MB + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/core/src/test/resources/logback.xml b/modules/core/src/test/resources/logback.xml index c683bc1c..8ea05885 100644 --- a/modules/core/src/test/resources/logback.xml +++ b/modules/core/src/test/resources/logback.xml @@ -1,12 +1,12 @@ - + - %d [%t] %-5p %-30.30c -%m%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + \ No newline at end of file diff --git a/modules/extension/src/test/resources/logback.xml b/modules/extension/src/test/resources/logback.xml index c683bc1c..8ea05885 100644 --- a/modules/extension/src/test/resources/logback.xml +++ b/modules/extension/src/test/resources/logback.xml @@ -1,12 +1,12 @@ - + - %d [%t] %-5p %-30.30c -%m%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + \ No newline at end of file diff --git a/modules/test/src/main/java/org/springside/modules/test/log/LogbackMockAppender.java b/modules/test/src/main/java/org/springside/modules/test/log/LogbackMockAppender.java index b8a22aab..13033141 100644 --- a/modules/test/src/main/java/org/springside/modules/test/log/LogbackMockAppender.java +++ b/modules/test/src/main/java/org/springside/modules/test/log/LogbackMockAppender.java @@ -120,6 +120,14 @@ public class LogbackMockAppender extends AppenderBase { logger.addAppender(this); } + /** + * 将此appender添加到root logger中. + */ + public void addToRootLogger() { + Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); + logger.addAppender(this); + } + /** * 将此appender从logger中移除. */ @@ -136,4 +144,12 @@ public class LogbackMockAppender extends AppenderBase { logger.detachAppender(this); } + /** + * 将此appender从root logger中移除. + */ + public void removeFromRootLogger() { + Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); + logger.detachAppender(this); + } + } diff --git a/modules/test/src/test/resources/logback.xml b/modules/test/src/test/resources/logback.xml index c683bc1c..8ea05885 100644 --- a/modules/test/src/test/resources/logback.xml +++ b/modules/test/src/test/resources/logback.xml @@ -1,12 +1,12 @@ - + - %d [%t] %-5p %-30.30c -%m%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + \ No newline at end of file