Author: sebb
Date: Tue May 29 12:42:40 2007
New Revision: 542633
URL: http://svn.apache.org/viewvc?view=rev&rev=542633
Log:
Tidy up remote start error messages, and remove double-reporting of init error.
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java?view=diff&rev=542633&r1=542632&r2=542633
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/RemoteStart.java
Tue May 29 12:42:40 2007
@@ -25,8 +25,6 @@
import java.util.Map;
import java.util.Set;
-import javax.swing.JOptionPane;
-
import org.apache.jmeter.engine.ClientJMeterEngine;
import org.apache.jmeter.engine.JMeterEngine;
import org.apache.jmeter.engine.JMeterEngineException;
@@ -36,19 +34,16 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author Michael Stover
- * @author Drew Gulino
- * @version $Revision$ Last updated $Date$
- */
public class RemoteStart extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
private static final String LOCAL_HOST = "127.0.0.1"; // $NON-NLS-1$
private static final String REMOTE_HOSTS = "remote_hosts"; // $NON-NLS-1$
jmeter.properties
+ private static final String REMOTE_HOSTS_SEPARATOR = ","; // $NON-NLS-1$
+
private static Set commands = new HashSet();
static {
commands.add(ActionNames.REMOTE_START);
@@ -79,19 +74,19 @@
} else if (action.equals(ActionNames.REMOTE_START_ALL)) {
popupShouldSave(e);
String remote_hosts_string =
JMeterUtils.getPropDefault(REMOTE_HOSTS, LOCAL_HOST);
- java.util.StringTokenizer st = new
java.util.StringTokenizer(remote_hosts_string, ",");
+ java.util.StringTokenizer st = new
java.util.StringTokenizer(remote_hosts_string, REMOTE_HOSTS_SEPARATOR);
while (st.hasMoreElements()) {
String el = (String) st.nextElement();
doRemoteInit(el.trim());
}
- st = new java.util.StringTokenizer(remote_hosts_string,
",");
+ st = new java.util.StringTokenizer(remote_hosts_string,
REMOTE_HOSTS_SEPARATOR);
while (st.hasMoreElements()) {
String el = (String) st.nextElement();
doRemoteStart(el.trim());
}
} else if (action.equals(ActionNames.REMOTE_STOP_ALL)) {
String remote_hosts_string =
JMeterUtils.getPropDefault(REMOTE_HOSTS, LOCAL_HOST);
- java.util.StringTokenizer st = new
java.util.StringTokenizer(remote_hosts_string, ",");
+ java.util.StringTokenizer st = new
java.util.StringTokenizer(remote_hosts_string, REMOTE_HOSTS_SEPARATOR);
while (st.hasMoreElements()) {
String el = (String) st.nextElement();
doRemoteStop(el.trim());
@@ -100,7 +95,7 @@
doRemoteExit(name);
} else if (action.equals(ActionNames.REMOTE_EXIT_ALL)) {
String remote_hosts_string =
JMeterUtils.getPropDefault(REMOTE_HOSTS, LOCAL_HOST);
- java.util.StringTokenizer st = new
java.util.StringTokenizer(remote_hosts_string, ",");
+ java.util.StringTokenizer st = new
java.util.StringTokenizer(remote_hosts_string, REMOTE_HOSTS_SEPARATOR);
while (st.hasMoreElements()) {
String el = (String) st.nextElement();
doRemoteExit(el.trim());
@@ -145,19 +140,13 @@
*/
private void doRemoteStart(String name) {
JMeterEngine engine = (JMeterEngine) remoteEngines.get(name);
- if (engine == null) {
+ if (engine != null) {
try {
- engine = new ClientJMeterEngine(name);
- remoteEngines.put(name, engine);
- } catch (Exception ex) {
- log.error("", ex);
- JMeterUtils.reportErrorToUser("Bad call to
remote host");
- return;
+ engine.runTest();
+ } catch (JMeterEngineException e) {
+
JMeterUtils.reportErrorToUser(e.getMessage(),JMeterUtils.getResString("remote_error_starting"));
// $NON-NLS-1$
}
- } else {
- engine.reset();
}
- startEngine(engine, name);
}
/**
@@ -170,8 +159,8 @@
engine = new ClientJMeterEngine(name);
remoteEngines.put(name, engine);
} catch (Exception ex) {
- log.error("", ex);
- JMeterUtils.reportErrorToUser("Bad call to
remote host");
+ log.error("Failed to initialise remote engine",
ex);
+
JMeterUtils.reportErrorToUser(ex.getMessage(),JMeterUtils.getResString("remote_error_init"));
// $NON-NLS-1$
return;
}
} else {
@@ -198,18 +187,5 @@
convertSubTree(testTree);
testTree.add(testTree.getArray()[0], gui.getMainFrame());
engine.configure(testTree);
- }
-
- /**
- * Starts the test on the remote engine.
- */
- private void startEngine(JMeterEngine engine, String host) {
- GuiPackage gui = GuiPackage.getInstance();
- try {
- engine.runTest();
- } catch (JMeterEngineException e) {
- JOptionPane.showMessageDialog(gui.getMainFrame(),
e.getMessage(), JMeterUtils
- .getResString("Error Occurred"),
JOptionPane.ERROR_MESSAGE);
- }
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties?view=diff&rev=542633&r1=542632&r2=542633
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
Tue May 29 12:42:40 2007
@@ -547,6 +547,8 @@
regexfunc_param_3=Which match to use. An integer 1 or greater, RAND to
indicate JMeter should randomly choose, A float, or ALL indicating all matches
should be used
regexfunc_param_4=Between text. If ALL is selected, the between text will be
used to generate the results
regexfunc_param_5=Default text. Used instead of the template if the regular
expression finds no matches
+remote_error_init=Error initialising remote server
+remote_error_starting=Error starting remote server
remote_exit=Remote Exit
remote_exit_all=Remote Exit All
remote_start=Remote Start
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
