More logging cleanup

ocymum · Dec 2, 2015 · 3db3d45 · 3db3d45
1 parent 138eb08
commit 3db3d45
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@
 target/
 .DS_Store
 dependency-reduced-pom.xml
-
+derby.log
diff --git a/integration-tests/.gitignore b/integration-tests/.gitignore
@@ -1,4 +1,9 @@
-/target/
-.DS_Store
+.classpath
 .project
 .settings/
+target/
+.DS_Store
+dependency-reduced-pom.xml
+derby.log
+
+
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -109,7 +109,9 @@
 					</container>
 					<configuration>
 						<properties>
-							<cargo.logging>high</cargo.logging>
+							<cargo.servlet.uriencoding>UTF-8</cargo.servlet.uriencoding>
+							<cargo.jvmargs>-Xmx512m</cargo.jvmargs>
+							<cargo.logging>low</cargo.logging>
 							<cargo.servlet.port>${dynamic.test.port}</cargo.servlet.port>
 						</properties>
 					</configuration>

diff --git a/integration-tests/src/test/resources/fedora-home/server/config/logback.xml b/integration-tests/src/test/resources/fedora-home/server/config/logback.xml
@@ -24,7 +24,6 @@
     <appender-ref ref="FEDORA"/>
     <appender-ref ref="STDOUT"/>
   </logger>
-
   <logger name="org.fcrepo.server.resourceIndex" additivity="false" level="DEBUG">
     <appender-ref ref="FEDORA"/>
   </logger>
@@ -41,7 +40,9 @@
   <logger name="org.apache.http" additivity="false" level="WARN">
     <appender-ref ref="STDOUT"/>
   </logger>
-
+  <logger name="httpclient.wire" additivity="false" level="WARN">
+    <appender-ref ref="STDOUT"/>
+  </logger>
   <root additivity="false" level="WARN">
     <appender-ref ref="FEDORA"/>
   </root>

diff --git a/integration-tests/src/test/resources/log4j.properties b/integration-tests/src/test/resources/log4j.properties
@@ -34,5 +34,5 @@ log4j.logger.org.apache.jena.tdb.loader=INFO
 log4j.additivity.org.apache.jena.riot=false
 log4j.logger.org.apache.jena.riot=INFO, jena.plainstdout
 
-log4j.additivity.org.apache.http.headers=false
-log4j.logger.org.apache.http.headers=WARN
+log4j.logger.httpclient.wire.header=WARN
+log4j.logger.httpclient.wire.content=WARN
diff --git a/integration-tests/src/test/resources/logback-test.xml b/integration-tests/src/test/resources/logback-test.xml
@@ -10,7 +10,7 @@
     <logger name="com.asoroka.trippi.impl" additivity="false" level="${testLogLevel:DEBUG}">
         <appender-ref ref="STDOUT"/>
     </logger>
-    <root additivity="false" level="INFO">
+    <root additivity="false" level="WARN">
         <appender-ref ref="STDOUT"/>
     </root>
 </configuration>
diff --git a/trippi-sparql/.gitignore b/trippi-sparql/.gitignore
@@ -0,0 +1,9 @@
+.classpath
+.project
+.settings/
+target/
+.DS_Store
+dependency-reduced-pom.xml
+derby.log
+
+