mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-07 17:28:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attempts at debugging the issue of Webserver returning nothing

Browse Source
This commit is contained in:
Rsl1122 2017-07-28 22:29:05 +03:00
parent 24a360d8f2
commit 6e821c8899
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java
View File

@ -28,6 +28,7 @@ import java.security.cert.CertificateException;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Base64; import java.util.Base64;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.Executors;
/** /**
* @author Rsl1122 * @author Rsl1122
@ -88,7 +89,7 @@ public class WebSocketServer {
keystore.load(fIn, storepass); keystore.load(fIn, storepass);
Certificate cert = keystore.getCertificate(alias); Certificate cert = keystore.getCertificate(alias);
Log.info("Found Certificate: " + cert); Log.info("Found Certificate: " + cert.getType());
keyManagerFactory = KeyManagerFactory.getInstance("SunX509"); keyManagerFactory = KeyManagerFactory.getInstance("SunX509");
keyManagerFactory.init(keystore, keypass); keyManagerFactory.init(keystore, keypass);
@ -96,7 +97,7 @@ public class WebSocketServer {
trustManagerFactory = TrustManagerFactory.getInstance("SunX509"); trustManagerFactory = TrustManagerFactory.getInstance("SunX509");
trustManagerFactory.init(keystore); trustManagerFactory.init(keystore);
server = HttpsServer.create(new InetSocketAddress(PORT), 0); server = HttpsServer.create(new InetSocketAddress(PORT), 10);
SSLContext sslContext = SSLContext.getInstance("TLS"); SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null); sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
@ -136,6 +137,7 @@ public class WebSocketServer {
return; // TODO Http Server return; // TODO Http Server
} }
server.createContext("/", serverResponse(null));
HttpContext analysisPage = server.createContext("/server", serverResponse(null)); HttpContext analysisPage = server.createContext("/server", serverResponse(null));
HttpContext playersPage = server.createContext("/players", new PlayersPageResponse(null, plugin)); HttpContext playersPage = server.createContext("/players", new PlayersPageResponse(null, plugin));
HttpContext inspectPage = server.createContext("/player", new InspectPageResponse(null, dataReqHandler, UUID.randomUUID())); // TODO HttpContext inspectPage = server.createContext("/player", new InspectPageResponse(null, dataReqHandler, UUID.randomUUID())); // TODO
@ -146,6 +148,8 @@ public class WebSocketServer {
} }
} }
server.setExecutor(Executors.newSingleThreadExecutor());
server.start(); server.start();
// server = new ServerSocket(PORT, 1, ip); // server = new ServerSocket(PORT, 1, ip);

14
Plan/src/main/java/com/djrapitops/plan/ui/webserver/response/Response.java
View File

@ -2,6 +2,7 @@ package main.java.com.djrapitops.plan.ui.webserver.response;
import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpHandler;
import main.java.com.djrapitops.plan.Log;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -57,11 +58,16 @@ public abstract class Response implements HttpHandler {
@Override @Override
public void handle(HttpExchange exchange) throws IOException { public void handle(HttpExchange exchange) throws IOException {
exchange.sendResponseHeaders(getCode(), content.length()); try {
exchange.sendResponseHeaders(getCode(), content.length());
OutputStream os = exchange.getResponseBody(); OutputStream os = exchange.getResponseBody();
os.write(content.getBytes()); os.write(content.getBytes());
os.close(); os.close();
} catch (Exception e) {
Log.toLog(this.getClass().getName(), e);
throw e;
}
} }
private int getCode() { private int getCode() {