From 2d2fe59eca303e2fe0ea36f831482bf10d8bb058 Mon Sep 17 00:00:00 2001
From: RblSb <msrblsb@gmail.com>
Date: Mon, 24 Feb 2020 15:07:37 +0300
Subject: Wow, same port for ws

---
 src/server/Main.hx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/server')

diff --git a/src/server/Main.hx b/src/server/Main.hx
index 1e2094e..b5fe3a6 100644
--- a/src/server/Main.hx
+++ b/src/server/Main.hx
@@ -34,14 +34,12 @@ class Main {
 
 	static function main():Void new Main();
 
-	public function new(port = 4200, wsPort = 4201) {
+	public function new(port = 4200, ?wsPort:Int) {
 		final envPort = (process.env : Dynamic).PORT;
 		if (envPort != null) port = envPort;
 		statePath = '$rootDir/user/state.json';
 		config = getUserConfig();
 		loadState();
-		wss = new WSServer({port: wsPort});
-		wss.on("connection", onConnect);
 		function exit() {
 			saveState();
 			process.exit();
@@ -77,9 +75,12 @@ class Main {
 		HttpServer.init(dir, '$rootDir/user/res');
 		Lang.init('$dir/langs');
 
-		Http.createServer((req, res) -> {
+		final server = Http.createServer((req, res) -> {
 			HttpServer.serveFiles(req, res);
-		}).listen(port);
+		});
+		server.listen(port);
+		wss = new WSServer({server: server, port: wsPort});
+		wss.on("connection", onConnect);
 	}
 
 	function getUserConfig():Config {
-- 
cgit v1.2.3