From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Oct 2019 07:56:12 +0000 (+0200)
Subject: Make Jetty start more robust.
X-Git-Tag: argeo-commons-2.1.81~4
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=7954fac52a6e7db11d9240cfbea85017c5612f19

Make Jetty start more robust.
---

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
index 41b064c9c..4a75f519d 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
@@ -33,6 +33,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationEvent;
 import org.osgi.service.cm.ConfigurationListener;
 
+/** Manages the LDIF-based deployment configuration. */
 class DeployConfig implements ConfigurationListener {
 	private final Log log = LogFactory.getLog(getClass());
 	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
@@ -146,8 +147,22 @@ class DeployConfig implements ConfigurationListener {
 		if (!webServerConfig.isEmpty()) {
 			webServerConfig.put("customizer.class", KernelConstants.CMS_JETTY_CUSTOMIZER_CLASS);
 		}
+
+		int tryCount = 60;
 		try {
-			JettyConfigurator.startServer(KernelConstants.DEFAULT_JETTY_SERVER, webServerConfig);
+			tryGettyJetty: while (tryCount > 0) {
+				try {
+					JettyConfigurator.startServer(KernelConstants.DEFAULT_JETTY_SERVER, webServerConfig);
+					break tryGettyJetty;
+				} catch (IllegalStateException e) {
+					// Jetty may not be ready
+					try {
+						Thread.sleep(1000);
+					} catch (Exception e1) {
+						// silent
+					}
+				}
+			}
 		} catch (Exception e) {
 			log.error("Cannot start default Jetty server with config " + webServerConfig, e);
 		}