diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/QuartzClusterableJob.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/QuartzClusterableJob.java index c34e5e7b..fd3f3b15 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/QuartzClusterableJob.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/QuartzClusterableJob.java @@ -20,7 +20,8 @@ import org.springside.examples.showcase.service.AccountService; */ public class QuartzClusterableJob extends QuartzJobBean { - private static Logger logger = LoggerFactory.getLogger(QuartzClusterableJob.class); + private static Logger logger = LoggerFactory + .getLogger(QuartzClusterableJob.class.getName() + ".quartz cluster job"); private ApplicationContext applicationContext; @@ -42,6 +43,6 @@ public class QuartzClusterableJob extends QuartzJobBean { long userCount = accountService.getUserCount(); String nodeName = (String) config.get("nodeName"); - logger.info("There are {} user in database, printed by quartz cluster job on node {}.", userCount, nodeName); + logger.info("There are {} user in database, on node {}.", userCount, nodeName); } } diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/UserCountScanner.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/UserCountScanner.java index a7f375c3..b336a262 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/UserCountScanner.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/schedule/UserCountScanner.java @@ -14,8 +14,6 @@ import org.springside.examples.showcase.service.AccountService; @Component public class UserCountScanner { - private static Logger logger = LoggerFactory.getLogger(UserCountScanner.class); - @Autowired private AccountService accountService; @@ -46,7 +44,8 @@ public class UserCountScanner { * 定时打印当前用户数到日志. */ private void execute(String by) { + Logger logger = LoggerFactory.getLogger(UserCountScanner.class.getName() + "." + by); long userCount = accountService.getUserCount(); - logger.info("There are {} user in database, printed by {}.", userCount, by); + logger.info("There are {} user in database.", userCount); } } diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java index 789f55f6..a58f259d 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/JdkTimerJobTest.java @@ -24,7 +24,7 @@ public class JdkTimerJobTest extends SpringTransactionalTestCase { public static void initLogger() { // 加载测试用logger appender appender = new LogbackListAppender(); - appender.addToLogger(UserCountScanner.class); + appender.addToLogger(UserCountScanner.class.getName() + ".jdk timer job"); } @AfterClass @@ -39,6 +39,6 @@ public class JdkTimerJobTest extends SpringTransactionalTestCase { // 验证任务已执行 assertEquals(1, appender.getLogsCount()); - assertEquals("There are 6 user in database, printed by jdk timer job.", appender.getFirstMessage()); + assertEquals("There are 6 user in database.", appender.getFirstMessage()); } } diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java index 3bb2b449..ae9ff557 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/QuartzTimerClusterJobTest.java @@ -29,7 +29,7 @@ public class QuartzTimerClusterJobTest extends SpringTransactionalTestCase { public static void initLogger() { // 加载测试用logger appender appender = new LogbackListAppender(); - appender.addToLogger(QuartzClusterableJob.class); + appender.addToLogger(QuartzClusterableJob.class.getName() + ".quartz cluster job"); } @AfterClass @@ -45,7 +45,6 @@ public class QuartzTimerClusterJobTest extends SpringTransactionalTestCase { // 验证任务已执行 assertEquals(1, appender.getLogsCount()); - assertEquals("There are 6 user in database, printed by quartz cluster job on node default.", - appender.getFirstMessage()); + assertEquals("There are 6 user in database, on node default.", appender.getFirstMessage()); } } diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java index dd035626..7b8a4ad7 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/demos/schedule/SpringTimerJobTest.java @@ -24,7 +24,7 @@ public class SpringTimerJobTest extends SpringTransactionalTestCase { public static void initLogger() { // 加载测试用logger appender appender = new LogbackListAppender(); - appender.addToLogger(UserCountScanner.class); + appender.addToLogger(UserCountScanner.class.getName() + ".spring timer job by xml"); } @AfterClass @@ -39,6 +39,6 @@ public class SpringTimerJobTest extends SpringTransactionalTestCase { // 验证任务已执行 assertEquals(1, appender.getLogsCount()); - assertEquals("There are 6 user in database, printed by spring timer job by xml.", appender.getFirstMessage()); + assertEquals("There are 6 user in database.", appender.getFirstMessage()); } }