Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-22 10:35:16 +01:00
Code Issues Projects Releases Wiki Activity

Small webserver code-style improvements

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2021-04-02 10:42:10 +02:00
parent a23178f772
commit 07932506fd
No known key found for this signature in database
GPG Key ID: 904C4995F9E1F800
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java
View File

@ -120,9 +120,9 @@ public void load() throws IOException, ParseResourceException {
}
webServer = new WebServer(
webServerConfig.getWebserverBindAddress(),
webServerConfig.getWebserverPort(),
webServerConfig.getWebserverMaxConnections(),
webServerConfig.getWebserverBindAddress(),
requestHandler,
false
);

20
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/webserver/WebServer.java
View File

@ -24,6 +24,8 @@
*/
package de.bluecolored.bluemap.core.webserver;
import de.bluecolored.bluemap.core.logger.Logger;
import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
@ -34,26 +36,28 @@
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import de.bluecolored.bluemap.core.logger.Logger;
public class WebServer extends Thread {
private final int port;
private final int maxConnections;
private final InetAddress bindAdress;
private final InetAddress bindAddress;
private final boolean verbose;
private HttpRequestHandler handler;
private final HttpRequestHandler handler;
private ThreadPoolExecutor connectionThreads;
private ServerSocket server;
public WebServer(int port, int maxConnections, InetAddress bindAdress, HttpRequestHandler handler, boolean verbose) {
public WebServer(InetAddress bindAddress, int port, int maxConnections, HttpRequestHandler handler) {
this(bindAddress, port, maxConnections, handler, false);
}
public WebServer(InetAddress bindAddress, int port, int maxConnections, HttpRequestHandler handler, boolean verbose) {
this.port = port;
this.maxConnections = maxConnections;
this.bindAdress = bindAdress;
this.verbose = verbose;
this.bindAddress = bindAddress;
this.verbose = verbose;
this.handler = handler;
@ -68,7 +72,7 @@ public synchronized void start() {
connectionThreads.allowCoreThreadTimeOut(true);
try {
server = new ServerSocket(port, maxConnections, bindAdress);
server = new ServerSocket(port, maxConnections, bindAddress);
server.setSoTimeout(0);
} catch (IOException e){
Logger.global.logError("Error while starting the WebServer!", e);

2
implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
View File

@ -224,9 +224,9 @@ public void startWebserver(BlueMapService blueMap, boolean verbose) throws IOExc
HttpRequestHandler requestHandler = new FileRequestHandler(config.getWebRoot().toPath(), "BlueMap v" + BlueMap.VERSION);
WebServer webServer = new WebServer(
config.getWebserverBindAddress(),
config.getWebserverPort(),
config.getWebserverMaxConnections(),
config.getWebserverBindAddress(),
requestHandler,
verbose
);