From dcece198527eb3012a081402ad2e117e2136a4a4 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 1 Aug 2011 11:30:31 +0200
Subject: import trunk@2167

---
 src/installer/resources/logging.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/src/installer/resources/logging.xml b/src/installer/resources/logging.xml
index 3e01593..5a6fc6e 100644
--- a/src/installer/resources/logging.xml
+++ b/src/installer/resources/logging.xml
@@ -7,22 +7,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>
+            <FileNamePattern>$DS_HOME$/etc/DiscoveryService/logs/discovery-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
 
-        <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>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern>
+        </layout>
     </appender>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <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>
+        <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>
     </appender>
     
     <!--
@@ -30,13 +30,13 @@
         Levels: ALL, ERROR, WARN, INFO, DEBUG, OFF
     -->
 
-    <!-- Logs DS, but not OpenSAML, messages -->
+    <!-- Logs IdP, but not OpenSAML, messages -->
     <logger name="edu.internet2.middleware.shibboleth">
         <level value="WARN" />
         <!-- Appender, DS_LOG, is inherited from the root logger -->
     </logger>
 
-    <!-- Logs OpenSAML, but not DS, messages -->
+    <!-- Logs OpenSAML, but not IdP, messages -->
     <logger name="org.opensaml">
         <level value="INFO" />
         <!-- Appender, DS_LOG, is inherited from the root logger -->
-- 
cgit v1.1