svn commit: r585205 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine: RemoteJMeterEngineImpl.java StandardJMeterEngine.java

[sebb]

Author: sebb
Date: Tue Oct 16 10:41:46 2007
New Revision: 585205

URL: http://svn.apache.org/viewvc?rev=585205&view=rev
Log:
Include hostname in server messages;
add finished log for server tests.

Modified:
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=585205&r1=585204&r2=585205&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
 Tue Oct 16 10:41:46 2007
@@ -37,6 +37,8 @@
 
        private JMeterEngine backingEngine;
 
+       private String hostName;
+
        public static final int DEFAULT_RMI_PORT = 
                JMeterUtils.getPropDefault("server.rmi.port", 1099); // 
$NON-NLS-1$
 
@@ -68,7 +70,9 @@
                }
                try {
                        Registry reg = LocateRegistry.getRegistry(port);
-                       backingEngine = new 
StandardJMeterEngine(InetAddress.getLocalHost().getHostName());
+                       hostName = InetAddress.getLocalHost().getHostName();
+                       log.info("Creating JMeter engine on host "+hostName);
+                       backingEngine = new StandardJMeterEngine(hostName);// 
see setHost()
                        reg.rebind("JMeterEngine", this); // $NON-NLS-1$
                        log.info("Bound to registry on port " + port);
                } catch (Exception ex) {
@@ -78,7 +82,9 @@
                }
        }
 
+       // TODO: is this really needed? The hostname is passed in when the 
engine is created
        public void setHost(String host) {
+               hostName=host;
                log.info("received host: " + host);
                backingEngine.setHost(host);
        }
@@ -99,7 +105,7 @@
                log.info("running test");
                log.debug("This = " + this);
                long now=System.currentTimeMillis();
-               System.out.println("Starting the test @ "+new Date(now)+" 
("+now+")");
+               System.out.println("Starting the test on host " + hostName + " 
@ "+new Date(now)+" ("+now+")");
                backingEngine.runTest();
        }
 

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=585205&r1=585204&r2=585205&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 10:41:46 2007
@@ -22,6 +22,7 @@
 import java.io.Serializable;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -243,6 +244,10 @@
                        }
                }
                log.info("Test has ended");
+               if (host != null) {
+                       long now=System.currentTimeMillis();
+                       System.out.println("Finished the test on host " + host 
+ " @ "+new Date(now)+" ("+now+")");
+               }
        }
 
        private ListedHashTree cloneTree(ListedHashTree tree) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]