[JBWS-3947] Fix logs and add a bit of iterations... ;-)

jbossws · Sep 14, 2015 · 2378c90 · 2378c90
1 parent 39adfd7
commit 2378c90
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 32 deletions.
diff --git a/modules/testsuite/perf-tests/pom.xml b/modules/testsuite/perf-tests/pom.xml
@@ -280,9 +280,10 @@
 	              <goal>jmeter</goal>
 	            </goals>
 	            <configuration>
-                    <overrideRootLogLevel>debug</overrideRootLogLevel>
+	                <!-- <overrideRootLogLevel>ERROR</overrideRootLogLevel> -->
                     <propertiesSystem>
                       <jbossws.integration.target>${jbossws.integration.target}</jbossws.integration.target>
+                      <log4j.configuration>file://${basedir}/target/jmeter/lib/log4j.xml</log4j.configuration>
                     </propertiesSystem>
                 </configuration>
 	          </execution>

diff --git a/modules/testsuite/perf-tests/src/test/etc/log4j.xml b/modules/testsuite/perf-tests/src/test/etc/log4j.xml
@@ -47,47 +47,30 @@
   <!-- Limit categories -->
   <!-- ================ -->
 
-  <category name="org.jboss.ws">
-    <priority value="DEBUG"/>
+  <category name="org.jboss">
+    <priority value="ERROR"/>
   </category>
 
-  <category name="org.jboss.wsf">
-    <priority value="DEBUG"/>
-  </category>
-
-  <category name="org.jboss.test.ws">
-    <priority value="TRACE"/>
-  </category>
-
-  <category name="org.apache.cxf">
-    <priority value="INFO"/>
+  <category name="org.apache">
+    <priority value="ERROR"/>
   </category>
 
   <category name="org.springframework">
-    <priority value="INFO"/>
+    <priority value="ERROR"/>
   </category>
 
   <category name="sun.rmi">
-    <priority value="INFO"/>
+    <priority value="ERROR"/>
   </category>
 
   <category name="com.sun.xml.bind">
-    <priority value="INFO"/>
+    <priority value="ERROR"/>
   </category>
 
   <category name="javax.activation">
-    <priority value="INFO"/>
+    <priority value="ERROR"/>
   </category>
 
-  <category name="org.apache.commons">
-    <priority value="INFO"/>
-  </category>
-
-  <!-- Apache security is verbose --> 
-  <category name="org.apache.ws.security">
-    <priority value="INFO"/>
-  </category>
-
   <!-- ======================= -->
   <!-- Setup the Root category -->
   <!-- ======================= -->

diff --git a/modules/testsuite/perf-tests/src/test/jmeter/jbossws.jmx b/modules/testsuite/perf-tests/src/test/jmeter/jbossws.jmx
@@ -15,12 +15,10 @@
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">1</stringProp>
+          <stringProp name="LoopController.loops">20000</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">10</stringProp>
-        <stringProp name="ThreadGroup.ramp_time">1</stringProp>
-        <longProp name="ThreadGroup.start_time">1338325941000</longProp>
-        <longProp name="ThreadGroup.end_time">1338325941000</longProp>
+        <stringProp name="ThreadGroup.num_threads">25</stringProp>
+        <!-- <stringProp name="ThreadGroup.ramp_time">0</stringProp> -->
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>

diff --git a/modules/testsuite/perf-tests/src/test/scripts/perf.groovy b/modules/testsuite/perf-tests/src/test/scripts/perf.groovy
@@ -1,7 +1,10 @@
 def root = new XmlParser().parse(project.properties['inputFile'])
 
 /**
- * Fix logging: remove CONSOLE handler and set a specific log file
+ * Fix logging:
+ * - remove CONSOLE handler and set a specific log file
+ * - set ERROR level for root-logger
+ * - add specfic categories with level set to ERROR for cxf and jboss
  *
  */
 def logHandlers = root.profile.subsystem.'root-logger'.handlers[0]
@@ -10,6 +13,13 @@ logHandlers.remove(consoleHandler)
 def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0]
 file.attributes()['path'] = project.properties['serverLog']
 
+def rootLogger = root.profile.subsystem.'root-logger'[0]
+rootLogger.level.@name = 'ERROR'
+def logSubsystem = rootLogger.parent()
+def jbossCategory = logSubsystem.appendNode('logger', ['category':'org.jboss'])
+jbossCategory.appendNode('level', ['name':'ERROR'])
+def apacheCategory = logSubsystem.appendNode('logger', ['category':'org.apache'])
+apacheCategory.appendNode('level', ['name':'ERROR'])
 
 /**
  * Save the configuration to a new file