mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-12 15:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Internal_IP setting not being used with Jetty

Browse Source
This commit is contained in:
Aurora Lahtela 2022-08-31 12:48:05 +03:00
parent aaec5eda8b
commit 6a4033ccda
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/configuration/WebserverConfiguration.java
View File

@ -78,6 +78,10 @@ public class WebserverConfiguration {
return config.get(WebserverSettings.PORT);
}
public String getInternalIP() {
return config.get(WebserverSettings.INTERNAL_IP);
}
public boolean isWebserverDisabled() {
return config.isTrue(WebserverSettings.DISABLED);
}

13
Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/http/JettyWebserver.java
View File

@ -121,6 +121,8 @@ public class JettyWebserver implements WebServer {
});
connector.setPort(port);
String internalIP = webserverConfiguration.getInternalIP();
connector.setHost(internalIP);
webserver.addConnector(connector);
if (usingHttps) {
@ -129,10 +131,19 @@ public class JettyWebserver implements WebServer {
webserver.setHandler(jettyRequestHandler);
}
String startFailure = "Failed to start Jetty webserver: ";
try {
webserver.start();
} catch (IOException e) {
if (e.getMessage().contains("Failed to bind")) {
boolean defaultInternalIp = "0.0.0.0".equals(internalIP);
String causeHelp = defaultInternalIp ? ", is the port (" + port + ") in use?" : ", is the Internal_IP (" + internalIP + ") invalid? (Use 0.0.0.0 for automatic)";
throw new EnableException(startFailure + e.getMessage() + causeHelp, e);
} else {
throw new EnableException(startFailure + e.toString(), e);
}
} catch (Exception e) {
throw new EnableException("Failed to start Jetty webserver: " + e.toString(), e);
throw new EnableException(startFailure + e.toString(), e);
}
webserverLogMessages.infoWebserverEnabled(getPort());