Author: sebb
Date: Fri Oct 3 16:41:06 2008
New Revision: 701568
URL: http://svn.apache.org/viewvc?rev=701568&view=rev
Log:
Log the remote host details
Try starting all remote hosts in non-GUI mode (as done in GUI mode)
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=701568&r1=701567&r2=701568&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri Oct 3
16:41:06 2008
@@ -757,6 +757,7 @@
while (st.hasMoreElements()) {
String el = (String) st.nextElement();
println("Configuring remote engine for " + el);
+ log.info("Configuring remote engine for " + el);
engines.add(doRemoteInit(el.trim(), tree));
}
println("Starting remote engines");
@@ -765,7 +766,9 @@
Iterator iter = engines.iterator();
while (iter.hasNext()) {
engine = (JMeterEngine) iter.next();
- engine.runTest();
+ if (engine != null){
+ engine.runTest();
+ }
}
println("Remote engines have been started");
}
@@ -849,7 +852,7 @@
} catch (Exception e) {
log.fatalError("Failure connecting to remote host", e);
System.err.println("Failure connecting to remote host"+e);
- System.exit(1);
+ return null;
}
engine.configure(testTree);
if (!remoteProps.isEmpty()) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java?rev=701568&r1=701567&r2=701568&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
Fri Oct 3 16:41:06 2008
@@ -56,7 +56,7 @@
commands.add(ActionNames.REMOTE_EXIT_ALL);
}
- private Map remoteEngines = new HashMap();
+ private final Map remoteEngines = new HashMap();
public RemoteStart() {
}
@@ -159,11 +159,13 @@
JMeterEngine engine = (JMeterEngine) remoteEngines.get(name);
if (engine == null) {
try {
+ log.info("Initialising remote engine: "+name);
engine = new ClientJMeterEngine(name);
remoteEngines.put(name, engine);
} catch (Exception ex) {
log.error("Failed to initialise remote engine", ex);
-
JMeterUtils.reportErrorToUser(ex.getMessage(),JMeterUtils.getResString("remote_error_init"));
// $NON-NLS-1$
+ JMeterUtils.reportErrorToUser(ex.getMessage(),
+ JMeterUtils.getResString("remote_error_init") + ": " +
name); // $NON-NLS-1$ $NON-NLS-2$
return;
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
