This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 4c6fc9b03c disable shutdown listener for Hop Server, fixes #3367
new 76238f8ab4 Merge pull request #3408 from hansva/master
4c6fc9b03c is described below
commit 4c6fc9b03c32fdef97fc3bd2cdf5ad28122b4c80
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Fri Nov 17 10:11:10 2023 +0100
disable shutdown listener for Hop Server, fixes #3367
---
.../main/java/org/apache/hop/www/WebServer.java | 112 ++++++++++-----------
1 file changed, 56 insertions(+), 56 deletions(-)
diff --git a/engine/src/main/java/org/apache/hop/www/WebServer.java
b/engine/src/main/java/org/apache/hop/www/WebServer.java
index 3fa52eedb1..339ca57ad7 100644
--- a/engine/src/main/java/org/apache/hop/www/WebServer.java
+++ b/engine/src/main/java/org/apache/hop/www/WebServer.java
@@ -17,6 +17,16 @@
package org.apache.hop.www;
+import java.awt.GraphicsEnvironment;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.Servlet;
import org.apache.hop.core.Const;
import org.apache.hop.core.HopEnvironment;
import org.apache.hop.core.encryption.Encr;
@@ -61,27 +71,14 @@ import org.eclipse.jetty.util.security.Password;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.glassfish.jersey.servlet.ServletContainer;
-import javax.servlet.Servlet;
-import java.awt.GraphicsEnvironment;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.List;
-
public class WebServer {
+ public static final int PORT = 80;
+ public static final int SHUTDOWN_PORT = 8079;
private static final int DEFAULT_DETECTION_TIMER = 20000;
private static final Class<?> PKG = WebServer.class; // For Translator
-
private ILogChannel log;
private IVariables variables;
- public static final int PORT = 80;
- public static final int SHUTDOWN_PORT = 8079;
-
private Server server;
private PipelineMap pipelineMap;
@@ -98,38 +95,6 @@ public class WebServer {
private SslConfiguration sslConfig;
- private static class MonitorThread extends Thread {
-
- private ServerSocket socket;
- private Server server;
-
- public MonitorThread(Server server, String hostname, int shutdownPort) {
- this.server = server;
- setDaemon(true);
- setName("StopMonitor");
- try {
- socket = new ServerSocket(shutdownPort, 1,
InetAddress.getByName(hostname));
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void run() {
- Socket accept;
- try {
- accept = socket.accept();
- BufferedReader reader = new BufferedReader(new
InputStreamReader(accept.getInputStream()));
- reader.readLine();
- server.stop();
- accept.close();
- socket.close();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- }
-
public WebServer(
ILogChannel log,
PipelineMap pipelineMap,
@@ -216,6 +181,10 @@ public class WebServer {
return server;
}
+ public void setServer(Server server) {
+ this.server = server;
+ }
+
public void startServer() throws Exception {
server = new Server();
@@ -328,8 +297,9 @@ public class WebServer {
// Start execution
createListeners();
- Thread monitor = new MonitorThread(server, hostname, shutdownPort);
- monitor.start();
+ // Temp disable shutdown listener #3367
+// Thread monitor = new MonitorThread(server, hostname, shutdownPort);
+// monitor.start();
server.start();
}
@@ -382,9 +352,11 @@ public class WebServer {
connector.setHost(hostname);
connector.setName(BaseMessages.getString(PKG,
"WebServer.Log.HopHTTPListener", hostname));
log.logBasic(BaseMessages.getString(PKG, "WebServer.Log.CreateListener",
hostname, "" + port));
- log.logBasic(
- BaseMessages.getString(
- PKG, "WebServer.Log.CreateShutDownListener", hostname, "" +
shutdownPort));
+
+ // Temp disable shutdown listener #3367
+ // log.logBasic(
+// BaseMessages.getString(
+// PKG, "WebServer.Log.CreateShutDownListener", hostname, "" +
shutdownPort));
server.setConnectors(new Connector[] {connector});
}
@@ -541,10 +513,6 @@ public class WebServer {
this.port = port;
}
- public void setServer(Server server) {
- this.server = server;
- }
-
/**
* Gets variables
*
@@ -587,4 +555,36 @@ public class WebServer {
}
return false;
}
+
+ private static class MonitorThread extends Thread {
+
+ private ServerSocket socket;
+ private Server server;
+
+ public MonitorThread(Server server, String hostname, int shutdownPort) {
+ this.server = server;
+ setDaemon(true);
+ setName("StopMonitor");
+ try {
+ socket = new ServerSocket(shutdownPort, 1,
InetAddress.getByName(hostname));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void run() {
+ Socket accept;
+ try {
+ accept = socket.accept();
+ BufferedReader reader = new BufferedReader(new
InputStreamReader(accept.getInputStream()));
+ reader.readLine();
+ server.stop();
+ accept.close();
+ socket.close();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
