andrew
/
Concord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up server run logic.

This commit is contained in:
Andrew Lalis 2021-08-26 11:30:42 +02:00
parent e9fa0c13a7
commit 2759097ef6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/main/java/nl/andrewl/concord_server/ConcordServer.java
View File

@ -184,7 +184,7 @@ public class ConcordServer implements Runnable {
@Override @Override
public void run() { public void run() {
this.running = true; this.running = true;
this.scheduledExecutorService.scheduleAtFixedRate(this::publishMetaDataToDiscoveryServers, 1, 1, TimeUnit.MINUTES); this.scheduledExecutorService.scheduleAtFixedRate(this::publishMetaDataToDiscoveryServers, 0, 1, TimeUnit.MINUTES);
ServerSocket serverSocket; ServerSocket serverSocket;
try { try {
serverSocket = new ServerSocket(this.config.getPort()); serverSocket = new ServerSocket(this.config.getPort());
@ -195,12 +195,17 @@ public class ConcordServer implements Runnable {
} }
System.out.println(startupMessage); System.out.println(startupMessage);
while (this.running) { while (this.running) {
Socket socket = serverSocket.accept(); try {
ClientThread clientThread = new ClientThread(socket, this); Socket socket = serverSocket.accept();
clientThread.start(); ClientThread clientThread = new ClientThread(socket, this);
clientThread.start();
} catch (IOException e) {
e.printStackTrace();
}
} }
serverSocket.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); System.err.println("Could not open server socket: " + e.getMessage());
} }
this.scheduledExecutorService.shutdown(); this.scheduledExecutorService.shutdown();
} }