浏览代码

Enable parameterization for log levels in logback files to allow the use of command-line options for controlling log output.

Luke Taylor 15 年之前
父节点
当前提交
bdb906e588

+ 3 - 1
acl/src/test/resources/logback-test.xml

@@ -5,7 +5,9 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 4 - 2
config/src/test/resources/logback-test.xml

@@ -5,9 +5,11 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
-  <logger name="org.apache.directory" level="WARN"/>
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
 
 
-  <root level="WARN">
+  <logger name="org.apache.directory" level="ERROR"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 3 - 1
core/src/test/resources/logback-test.xml

@@ -5,7 +5,9 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 2 - 1
itest/context/src/test/resources/logback-test.xml

@@ -5,9 +5,10 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
   <logger name="org.apache.directory" level="ERROR"/>
   <logger name="org.apache.directory" level="ERROR"/>
 
 
-  <root level="WARN">
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 2 - 1
itest/web/src/test/resources/logback-test.xml

@@ -5,9 +5,10 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
   <logger name="org.apache.directory" level="ERROR"/>
   <logger name="org.apache.directory" level="ERROR"/>
 
 
-  <root level="WARN">
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 2 - 1
ldap/src/test/resources/logback-test.xml

@@ -5,9 +5,10 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
   <logger name="org.apache.directory" level="ERROR"/>
   <logger name="org.apache.directory" level="ERROR"/>
 
 
-  <root level="WARN">
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 3 - 1
samples/aspectj/src/test/resources/logback-test.xml

@@ -5,7 +5,9 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 3 - 1
samples/contacts/src/test/resources/logback-test.xml

@@ -5,7 +5,9 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 3 - 1
samples/dms/src/test/resources/logback-test.xml

@@ -5,7 +5,9 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>
 
 

+ 3 - 1
web/src/test/resources/logback-test.xml

@@ -5,7 +5,9 @@
     </encoder>
     </encoder>
   </appender>
   </appender>
 
 
-  <root level="WARN">
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <root level="${root.level}:-WARN">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="STDOUT" />
   </root>
   </root>