From 8f5c6b8cd5b4aeb18ea6ecb74b23f4ba8e62d375 Mon Sep 17 00:00:00 2001
From: anthorob <anthonyrobert1997@hotmail.fr>
Date: Tue, 21 Sep 2021 11:39:21 -0400
Subject: [PATCH] Modified settings class

---
 .gitignore                                         |  3 +++
 bot.config.example                                 | 11 +++++++++++
 src/main/java/netneutrality/db/MysqlConnector.java |  2 +-
 src/main/java/netneutrality/db/MysqlDatabase.java  |  6 +++---
 src/main/java/netneutrality/utils/Settings.java    | 10 ++++++----
 src/main/resources/bot.config                      |  5 -----
 6 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 bot.config.example
 delete mode 100644 src/main/resources/bot.config

diff --git a/.gitignore b/.gitignore
index d8fc794..6d10652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,9 @@
 # BlueJ files
 *.ctxt
 
+# Config file
+bot.config
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
diff --git a/bot.config.example b/bot.config.example
new file mode 100644
index 0000000..76fa6b1
--- /dev/null
+++ b/bot.config.example
@@ -0,0 +1,11 @@
+bot.token=
+bot.prefix=
+bot.owner=
+bot.ownerguild=
+bot.errorchannel=
+
+mysql.host=localhost
+mysql.user=root
+mysql.password=
+mysql.database=
+mysql.port=3306
\ No newline at end of file
diff --git a/src/main/java/netneutrality/db/MysqlConnector.java b/src/main/java/netneutrality/db/MysqlConnector.java
index 1f6034a..9a33dc2 100644
--- a/src/main/java/netneutrality/db/MysqlConnector.java
+++ b/src/main/java/netneutrality/db/MysqlConnector.java
@@ -33,7 +33,7 @@ public class MysqlConnector {
 		dataSource.setPort(3306);
 		dataSource.setDatabaseName(dbName);
 		dataSource.setAutoReconnect(true);
-		dataSource.setAutoReconnectForPools(true);
+		dataSource.setConnectTimeout(5000);
 		c = dataSource.getConnection();
 
 		return this;
diff --git a/src/main/java/netneutrality/db/MysqlDatabase.java b/src/main/java/netneutrality/db/MysqlDatabase.java
index bb0f00a..6f1f67c 100644
--- a/src/main/java/netneutrality/db/MysqlDatabase.java
+++ b/src/main/java/netneutrality/db/MysqlDatabase.java
@@ -42,9 +42,9 @@ public class MysqlDatabase {
 
 	protected MysqlDatabase(String dbName) {
 		this.dbName = dbName;
-		String dbUser = Settings.getInstance().get("mysql.user");
-		String dbPass = Settings.getInstance().get("mysql.password");
-		String dbHost = Settings.getInstance().get("mysql.host");
+		String dbUser = Settings.getInstance().get("mysql.user", "root");
+		String dbPass = Settings.getInstance().get("mysql.password", "");
+		String dbHost = Settings.getInstance().get("mysql.host", "localhost");
 
 		try {
 			logger.info(String.format("Connecting to database '%1$s' at %2$s:3306", dbName, dbHost));
diff --git a/src/main/java/netneutrality/utils/Settings.java b/src/main/java/netneutrality/utils/Settings.java
index 61cbc10..3f1b730 100644
--- a/src/main/java/netneutrality/utils/Settings.java
+++ b/src/main/java/netneutrality/utils/Settings.java
@@ -14,12 +14,14 @@ public class Settings {
     private final Properties prop = new Properties();
 
     public Settings() {
-        String configFile = "bot.config";
+        File file = new File("bot.config");
 
         try {
-            InputStream is = Settings.class.getClassLoader().getResourceAsStream(configFile);
-            prop.load(is);
-            is.close();
+            file.createNewFile();
+
+            FileInputStream fis = new FileInputStream(file);
+            prop.load(fis);
+            fis.close();
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/src/main/resources/bot.config b/src/main/resources/bot.config
deleted file mode 100644
index 2d0eb74..0000000
--- a/src/main/resources/bot.config
+++ /dev/null
@@ -1,5 +0,0 @@
-bot.token=
-bot.prefix=$
-bot.owner=
-bot.ownerguild=
-bot.errorchannel=
\ No newline at end of file