Bug 552684 - [Passage] Server should show diagnostic when address in

use. The launch processing on same IP.
eclipse-passage · Nov 5, 2019 · ec1d71e · ec1d71e
1 parent 9c015f8
commit ec1d71e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/....lbc.equinox/src/org/eclipse/passage/lbc/internal/equinox/i18n/EquinoxMessages.properties b/....lbc.equinox/src/org/eclipse/passage/lbc/internal/equinox/i18n/EquinoxMessages.properties
@@ -23,4 +23,4 @@ ServerConditionArbiter_i_not_reserved=Condition was not reserved
 ServerConditionArbiter_i_reserv=Condition in reserve
 ServerRunnerImpl_i_launcher_bind=Bind BackendLauncher {0}
 ServerRunnerImpl_i_launcher_unbind=Unbind BackendLauncher {0}
-ServerRunnerImpl_error_launching=[ERROR] Server BackendLauncher class "{0}" was not started.
+ServerRunnerImpl_error_launching=[ERROR] Could not start BackendLauncher instance:"{0}".
diff --git a/...pse.passage.lbc.jetty/src/org/eclipse/passage/lbc/internal/jetty/JettyServerLauncher.java b/...pse.passage.lbc.jetty/src/org/eclipse/passage/lbc/internal/jetty/JettyServerLauncher.java
@@ -68,11 +68,14 @@ public LicensingResult launch(Map<String, Object> arguments) {
 			server.setHandler(new JettyRequestHandler(requestDispatchers.values()));
 			server.start();
 			logger.info(server.getState());
-			return LicensingResults.createOK(JettyMessages.JettyServerLauncher_server_start_succecss, source);
+			return LicensingResults.createOK(JettyMessages.JettyServerLauncher_server_start_success, source);
 		} catch (Exception e) {
-			String msg = NLS.bind(JettyMessages.JettyServerLauncher_server_start_error, e.getCause());
-			logger.warn(msg);
-			return LicensingResults.createError(msg, source, e);
+			String msg = e.getMessage();
+			if (e.getCause() != null) {
+				msg = e.getCause().getMessage();
+			}
+			return LicensingResults.createError(NLS.bind(JettyMessages.JettyServerLauncher_server_start_error, msg),
+					source, e);
 		}
 	}
 

diff --git a/...ipse.passage.lbc.jetty/src/org/eclipse/passage/lbc/internal/jetty/i18n/JettyMessages.java b/...ipse.passage.lbc.jetty/src/org/eclipse/passage/lbc/internal/jetty/i18n/JettyMessages.java
@@ -21,7 +21,7 @@ public class JettyMessages extends NLS {
 	public static String JettyServerLauncher_server_not_started_error;
 	public static String JettyServerLauncher_server_stop_error;
 
-	public static String JettyServerLauncher_server_start_succecss;
+	public static String JettyServerLauncher_server_start_success;
 	public static String JettyServerLauncher_server_stop_success;
 	static {
 		// initialize resource bundle

diff --git a/...assage.lbc.jetty/src/org/eclipse/passage/lbc/internal/jetty/i18n/JettyMessages.properties b/...assage.lbc.jetty/src/org/eclipse/passage/lbc/internal/jetty/i18n/JettyMessages.properties
@@ -11,10 +11,10 @@
 #     ArSysOp - initial API and implementation
 ###############################################################################
 
-JettyServerLauncher_server_start_error=[ERROR] Launch Jetty Server with error: {0}
+JettyServerLauncher_server_start_error=[ERROR] Launch Jetty Server with error: "{0}".
 JettyServerLauncher_server_running_error=[ERROR] Jetty Server already running.
 JettyServerLauncher_server_stop_error=[ERROR] Stops Jetty Server with error: {0}
 JettyServerLauncher_server_not_started_error=[ERROR] Jetty Server was not started.
 
-JettyServerLauncher_server_start_succecss=Jetty Server successfully started
+JettyServerLauncher_server_start_success=Jetty Server successfully started
 JettyServerLauncher_server_stop_success=Jetty Server stopped successfully