Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-17 09:40:25 +01:00
Code Issues Packages Projects Releases Activity

Improve docker healthcheck (#2110)

Browse Source 
The new docker health check respects the jetty configuration and uses the configured port and context path.
It supports ssl listeners and follows redirects.

Co-authored-by: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
This commit is contained in:
Eduard Heimbuch
2022-08-30 11:02:21 +02:00
committed by GitHub
parent 6055ba145f
commit f672e175b5
17 changed files with 1261 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scm-server/src/main/java/sonia/scm/server/ScmServer.java
View File

@@ -27,11 +27,6 @@ package sonia.scm.server;
//~--- non-JDK imports --------------------------------------------------------
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.xml.XmlConfiguration;
//~--- JDK imports ------------------------------------------------------------
import java.net.URL;
/**
*
@@ -39,10 +34,6 @@ import java.net.URL;
*/
public class ScmServer extends Thread
{
/** Field description */
public static final String CONFIGURATION = "/server-config.xml";
/** Field description */
static final int GRACEFUL_TIMEOUT = 2000;
@@ -54,25 +45,9 @@ public class ScmServer extends Thread
*/
public ScmServer()
{
URL configURL = ScmServer.class.getResource(CONFIGURATION);
if (configURL == null)
{
throw new ScmServerException("could not find server-config.xml");
}
ServerConfiguration config = new ServerConfiguration();
server = new org.eclipse.jetty.server.Server();
try
{
XmlConfiguration config = new XmlConfiguration(configURL);
config.configure(server);
}
catch (Exception ex)
{
throw new ScmServerException("error during server configuration", ex);
}
config.configure(server);
}
//~--- methods --------------------------------------------------------------