From cc29b53e134f1e3a07666b1066f7caf4dad0af6c Mon Sep 17 00:00:00 2001
From: senju <senju@users.sourceforge.jp>
Date: Tue, 25 Aug 2009 19:00:58 +0900
Subject: [PATCH] =?utf8?q?=E3=83=AD=E3=82=B0=E3=81=AE=E5=BD=A2=E5=BC=8F?=
 =?utf8?q?=E3=82=92logback=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                         |  1 +
 build.xml                                          |  9 ++++++++
 doc/deploy.txt                                     |  4 ++++
 .../interceptors/AuthenticationInterceptor.java    |  4 ++--
 .../rabbitBTS/interceptors/TraceInterceptor.java   |  4 ++--
 .../rabbitBTS/services/AccountService.java         |  4 ++--
 war/WEB-INF/classes/logback.xml                    | 26 ++++++++++++++++++++++
 7 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 doc/deploy.txt
 create mode 100644 war/WEB-INF/classes/logback.xml

diff --git a/.gitignore b/.gitignore
index 3422e0e..08f838f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 *.bin
 *.tgz
 *.swp
+log.xml
 datastore-indexes-auto.xml
diff --git a/build.xml b/build.xml
index 165fc0d..9c563fa 100644
--- a/build.xml
+++ b/build.xml
@@ -14,7 +14,16 @@
     </fileset>
   </path>
 
+  <target name="init">
+    <delete>
+      <fileset dir=".">
+        <include name="**/*.swp" />
+      </fileset>
+    </delete>
+  </target>
+
   <target name="copyjars"
+      depends="init"
       description="Copies the App Engine JARs to the WAR.">
     <copy
         todir="war/WEB-INF/lib"
diff --git a/doc/deploy.txt b/doc/deploy.txt
new file mode 100644
index 0000000..a9f25bb
--- /dev/null
+++ b/doc/deploy.txt
@@ -0,0 +1,4 @@
+logback/jul切り替え(ログレベル含む)
+freemarkerのキャッシュを切る
+トレースインターセプターを切る
+メッセージソースのリロード時間を切る
diff --git a/src/jp/sourceforge/rabbitBTS/interceptors/AuthenticationInterceptor.java b/src/jp/sourceforge/rabbitBTS/interceptors/AuthenticationInterceptor.java
index 21001c1..886792e 100644
--- a/src/jp/sourceforge/rabbitBTS/interceptors/AuthenticationInterceptor.java
+++ b/src/jp/sourceforge/rabbitBTS/interceptors/AuthenticationInterceptor.java
@@ -57,7 +57,7 @@ public class AuthenticationInterceptor extends HandlerInterceptorAdapter {
 			// アカウント未登録の場合、登録ページにリダイレクトする。
 			response.sendRedirect("/register/");
 			Sht.log(this).warn(
-					"403(not registerd.) " + request.getRequestURL());
+					"403(not registerd.) {}", request.getRequestURL());
 			return false;
 		} catch (final HasNotValidIdException e) {
 			if (handler instanceof IPublicController) {
@@ -67,7 +67,7 @@ public class AuthenticationInterceptor extends HandlerInterceptorAdapter {
 
 			// ログインしていない場合、ログインページにリダイレクトする。
 			response.sendRedirect(Sht.loginUrl(request));
-			Sht.log(this).warn("403 " + request.getRequestURL());
+			Sht.log(this).warn("403 {}", request.getRequestURL());
 			return false;
 		}
 	}
diff --git a/src/jp/sourceforge/rabbitBTS/interceptors/TraceInterceptor.java b/src/jp/sourceforge/rabbitBTS/interceptors/TraceInterceptor.java
index 1f2b2da..4851d71 100644
--- a/src/jp/sourceforge/rabbitBTS/interceptors/TraceInterceptor.java
+++ b/src/jp/sourceforge/rabbitBTS/interceptors/TraceInterceptor.java
@@ -31,13 +31,13 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
 	public void postHandle(HttpServletRequest request,
 			HttpServletResponse response, Object handler,
 			ModelAndView modelAndView) throws Exception {
-		Sht.log(this).trace("postHandle " + makeURL(request));
+		Sht.log(this).trace("postHandle {}", makeURL(request));
 	}
 
 	@Override
 	public boolean preHandle(HttpServletRequest request,
 			HttpServletResponse response, Object handler) throws Exception {
-		Sht.log(this).trace("preHandle " + makeURL(request));
+		Sht.log(this).trace("preHandle {}", makeURL(request));
 		return true;
 	}
 
diff --git a/src/jp/sourceforge/rabbitBTS/services/AccountService.java b/src/jp/sourceforge/rabbitBTS/services/AccountService.java
index 22e6ed1..5f5c2fc 100644
--- a/src/jp/sourceforge/rabbitBTS/services/AccountService.java
+++ b/src/jp/sourceforge/rabbitBTS/services/AccountService.java
@@ -107,13 +107,13 @@ public class AccountService {
 		if (account.getEmail().equals(this.firstSuperUser)) {
 			account.setAdmin(true);
 			Sht.log(this).warn(
-					"Admin Account Created. " + this.firstSuperUser);
+					"Admin Account Created. {}", this.firstSuperUser);
 		}
 
 		// nickName重複チェック
 		if (this.accountDao.findAccountByNickName(account.getNickName()) != null) {
 			Sht.log(this).info(
-					"nickName " + account.getNickName() + " is already used.");
+					"nickName {} is already used.", account.getNickName());
 			throw new RabbitBTSException("nickNameが重複しています。");
 		}
 
diff --git a/war/WEB-INF/classes/logback.xml b/war/WEB-INF/classes/logback.xml
new file mode 100644
index 0000000..5736155
--- /dev/null
+++ b/war/WEB-INF/classes/logback.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- vim:set ts=2 sts=2 sw=2 et fenc=utf-8 -->
+<configuration scan="true" scanPeriod="3 seconds">
+  <appender name="STDOUT"
+    class="ch.qos.logback.core.ConsoleAppender">
+    <layout class="ch.qos.logback.classic.PatternLayout">
+      <Pattern>
+		  %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg %ex %n
+     </Pattern>
+    </layout>
+  </appender>
+<appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <File>log.xml</File>
+    <layout class="ch.qos.logback.classic.log4j.XMLLayout">
+      <LocationInfo>true</LocationInfo>
+    </layout>
+  </appender> 
+
+  <logger name="jp.sourceforge.rabbitBTS" level="TRACE" />
+  <logger name="org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver" level="OFF" />
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+	<appender-ref ref="FILE" />
+  </root>
+
+</configuration>
-- 
2.11.0