From 3ed166f8e78f8d827c3d0012d8c0c560b6b33781 Mon Sep 17 00:00:00 2001
From: Zaxar163 <zahar.vcherachny@yandex.ru>
Date: Sun, 5 Apr 2020 10:20:35 +0300
Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B6=D0=BA=D0=B0=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B0=20=D0=BF=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20PostgreSQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                | 2 +-
 .../gravit/launchserver/auth/PostgreSQLSourceConfig.java  | 8 ++++----
 .../socket/handlers/NettyServerSocketHandler.java         | 7 +++----
 build.gradle                                              | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 46a38783..2fdee56b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,6 @@ buildnumber
 *.directory
 cmd.bat
 cmd.sh
+project/target
 ## PVS Studio
 .PVS-Studio/
-project/target
diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/PostgreSQLSourceConfig.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/PostgreSQLSourceConfig.java
index 9de90848..f32e219c 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/PostgreSQLSourceConfig.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/PostgreSQLSourceConfig.java
@@ -21,8 +21,8 @@ public final class PostgreSQLSourceConfig implements AutoCloseable {
     private String poolName;
 
     // Config
-    private String address;
-    private int port;
+    private String[] addresses;
+    private int[] ports;
     private String username;
     private String password;
     private String database;
@@ -43,8 +43,8 @@ public final class PostgreSQLSourceConfig implements AutoCloseable {
             PGSimpleDataSource postgresqlSource = new PGSimpleDataSource();
 
             // Set credentials
-            postgresqlSource.setServerNames(new String[] {address}); //TODO support multinode PostgreSQL DB
-            postgresqlSource.setPortNumbers(new int[] {port});
+            postgresqlSource.setServerNames(addresses);
+            postgresqlSource.setPortNumbers(ports);
             postgresqlSource.setUser(username);
             postgresqlSource.setPassword(password);
             postgresqlSource.setDatabaseName(database);
diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyServerSocketHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyServerSocketHandler.java
index bb3c944d..530be65f 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyServerSocketHandler.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyServerSocketHandler.java
@@ -10,6 +10,7 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.Set;
 
+// TODO refactor
 @SuppressWarnings("unused")
 public final class NettyServerSocketHandler implements Runnable, AutoCloseable {
     private SSLServerSocketFactory ssf;
@@ -18,9 +19,6 @@ public final class NettyServerSocketHandler implements Runnable, AutoCloseable {
 
     public LauncherNettyServer nettyServer;
 
-    // API
-    private Set<Socket> sockets;
-
     private transient final LaunchServer server;
 
     public NettyServerSocketHandler(LaunchServer server) {
@@ -29,7 +27,8 @@ public final class NettyServerSocketHandler implements Runnable, AutoCloseable {
 
     @Override
     public void close() {
-        //TODO: Close Impl
+        nettyServer.close();
+        nettyServer.service.channels.close();
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index bf75dddc..31e5ffca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '5.2.0' apply false
     id 'maven-publish'
     id 'signing'
-    id 'org.openjfx.javafxplugin' version '0.0.7' apply false
+    id 'org.openjfx.javafxplugin' version '0.0.8' apply false
 }
 group = 'pro.gravit.launcher'
 version = '5.1.3'