You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/10/16 22:18:06 UTC

svn commit: r585252 - in /jakarta/jmeter/trunk: bin/jmeter.properties src/core/org/apache/jmeter/engine/StandardJMeterEngine.java xdocs/changes.xml

Author: sebb
Date: Tue Oct 16 13:18:06 2007
New Revision: 585252

URL: http://svn.apache.org/viewvc?rev=585252&view=rev
Log:
Add server.exitatend property - server will exit after a single test if set

Modified:
    jakarta/jmeter/trunk/bin/jmeter.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: jakarta/jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.properties?rev=585252&r1=585251&r2=585252&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.properties (original)
+++ jakarta/jmeter/trunk/bin/jmeter.properties Tue Oct 16 13:18:06 2007
@@ -114,9 +114,12 @@
 # To change the default port (1099) used to access the server:
 #server.rmi.port=1234
 
-# Since JMeter 2.3.1, the jmeter server creates the RMI registry as part of the server process.
+# From JMeter 2.3.1, the jmeter server creates the RMI registry as part of the server process.
 # To stop the server creating the RMI registry:
 #server.rmi.create=false
+
+# From JMeter 2.3.1, define the following property to cause JMeter to exit after the first test
+#server.exitaftertest=true
 
 #---------------------------------------------------------------------------
 #         Logging Configuration

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=585252&r1=585251&r2=585252&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Tue Oct 16 13:18:06 2007
@@ -53,7 +53,7 @@
 public class StandardJMeterEngine implements JMeterEngine, JMeterThreadMonitor, Runnable, Serializable {
 	private static final Logger log = LoggingManager.getLoggerForClass();
 
-	private static final long serialVersionUID = 221L; // Remember to change this when the class changes ...
+	private static final long serialVersionUID = 231L; // Remember to change this when the class changes ...
 	
 	private transient Thread runningThread;
 
@@ -77,8 +77,12 @@
 
 	private transient ListenerNotifier notifier;
 
+	// Should we exit at end of the test? (only applies to server, because host is non-null)
+	private static final boolean exitAfterTest =
+		JMeterUtils.getPropDefault("server.exitaftertest", false);  // $NON-NLS-1$
+
     private static final boolean startListenersLater = 
-        JMeterUtils.getPropDefault("jmeterengine.startlistenerslater", true);
+        JMeterUtils.getPropDefault("jmeterengine.startlistenerslater", true); // $NON-NLS-1$
 
     static {
         if (startListenersLater){
@@ -247,6 +251,9 @@
 		if (host != null) {
 			long now=System.currentTimeMillis();
 			System.out.println("Finished the test on host " + host + " @ "+new Date(now)+" ("+now+")");
+			if (exitAfterTest){
+				exit();
+			}
 		}
 	}
 

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=585252&r1=585251&r2=585252&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Oct 16 13:18:06 2007
@@ -76,6 +76,7 @@
 <li>HTTP Mirror Server GUI now has the Start and Stop buttons in a more visible place</li>
 <li>Server mode now creates the RMI registry; to disable set the JMeter property server.rmi.create=false</li>
 <li>HTTP Sampler now supports using MIME Type field to specify content-type request header when body is constructed from parameter values</li>
+<li>Enable exit after a single server test - define JMeter property server.exitaftertest=true</li>
 </ul>
 
 <h4>Non-functional Improvements</h4>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org