Prechádzať zdrojové kódy

Set log levels to ERROR level when running CAS integration tests

Rob Winch 14 rokov pred
rodič
commit
4c43bde064

+ 16 - 2
samples/cas/cas.gradle

@@ -1,5 +1,7 @@
 // CAS sample build file
 
+import org.apache.tools.ant.filters.ReplaceTokens
+
 apply plugin: 'war'
 apply plugin: 'jetty'
 apply plugin: 'groovy'
@@ -75,12 +77,16 @@ task casServerOverlay(type: Sync) {
     overlayDir = file('src/cas-server-overlay/webapp')
     explodedWar = file("$buildDir/tmp/${warName}")
     customWar = file("$buildDir/tmp/${warName}.war")
+    tokens = [logLevel: 'INFO']
 
     inputs.files(war, overlayDir)
-    outputs.files(customWar, explodedWar, file("$buildDir/tmp/expandedArchives"))
+    inputs.property('tokens',{tokens})
+    outputs.files(customWar,explodedWar,file("$buildDir/tmp/expandedArchives"))
 
     from zipTree(war)
-    from overlayDir
+    from (overlayDir) {
+        filter(ReplaceTokens,tokens: tokens)
+    }
     into explodedWar
 
     doLast {
@@ -90,6 +96,11 @@ task casServerOverlay(type: Sync) {
         ant.zip(destfile: customWar, baseDir: explodedWar)
     }
 }
+
+casServerOverlay.metaClass.setLogLevel { level ->
+    tokens['logLevel'] = level
+}
+
 task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar, dependsOn: 'casServerOverlay') {
     contextPath = "/cas"
     connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
@@ -126,6 +137,9 @@ gradle.taskGraph.whenReady {graph ->
         casServer.daemon = true
     }
     if(graph.hasTask(integrationTest)) {
+        casServerOverlay.logLevel = 'ERROR'
+        jettyRunWar.additionalRuntimeJars += file("src/integration-test/resources")
+
         jettyRunWar.daemon = true
         jettyRunWar.httpConnector.port = availablePort()
         jettyRunWar.httpsConnector.port = jettyRunWar.httpConnector.confidentialPort = availablePort()

+ 17 - 0
samples/cas/src/cas-server-overlay/webapp/WEB-INF/classes/log4j.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
+    <appender name="console" class="org.apache.log4j.ConsoleAppender">
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %p [%c] - &lt;%m&gt;%n"/>
+        </layout>
+    </appender>
+    <logger name="org.jasig" additivity="true">
+        <level value="@logLevel@" />
+    </logger>
+    <root>
+        <level value="ERROR"/>
+        <appender-ref ref="console"/>
+    </root>
+</log4j:configuration>

+ 11 - 0
samples/cas/src/integration-test/resources/logback-test.xml

@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="error">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>