From b5c41b83249677bf1dec46de4a7ce97fee55729e Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 3 Nov 2011 10:53:40 +0100
Subject: import 1.1.3

---
 src/installer/resources/logging.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 src/installer/resources/logging.xml

(limited to 'src/installer/resources/logging.xml')

diff --git a/src/installer/resources/logging.xml b/src/installer/resources/logging.xml
old mode 100644
new mode 100755
index 77fefd6..eff4799
--- a/src/installer/resources/logging.xml
+++ b/src/installer/resources/logging.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <configuration>
 
     <!-- 
@@ -7,22 +6,22 @@
      -->
     <appender name="DS_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>$DS_HOME$/logs/discoveryService.log</File>
-        <ImmediateFlush>true</ImmediateFlush>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>$DS_HOME$/logs/discovery-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
 
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern>
-        </layout>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <charset>UTF-8</charset>
+            <Pattern>%date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n%ex{full}%n</Pattern>
+        </encoder>
     </appender>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <ImmediateFlush>true</ImmediateFlush>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern>
-        </layout>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <charset>UTF-8</charset>
+            <Pattern>%date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n%ex{full}%n</Pattern>
+        </encoder>
     </appender>
     
     <!--
@@ -32,19 +31,19 @@
 
     <!-- Logs DS, but not OpenSAML, messages -->
     <logger name="edu.internet2.middleware.shibboleth">
-        <level value="WARN" />
+        <level value="WARN"/>
         <!-- Appender, DS_LOG, is inherited from the root logger -->
     </logger>
 
     <!-- Logs OpenSAML, but not DS, messages -->
     <logger name="org.opensaml">
-        <level value="INFO" />
+        <level value="INFO"/>
         <!-- Appender, DS_LOG, is inherited from the root logger -->
     </logger>
 
     <root>
-        <level value="WARN" />
-        <appender-ref ref="DS_LOG" />
+        <level value="WARN"/>
+        <appender-ref ref="DS_LOG"/>
     </root>
 
 </configuration>
-- 
cgit v1.1