feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Merge pull request #870 from Joo200/feature/mariadb-connector

Browse Source 
MariaDB 11 compatibility fix: configurable protocol
This commit is contained in:
Brokkonaut
2023-09-22 07:32:41 +02:00
committed by GitHub
parent 1c0c6c2d8b 8786dc253e
commit a6b37c03d0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/diddiz/LogBlock/config/Config.java
View File

@ -81,6 +81,7 @@ public class Config {
worldNames.add("world_the_end"); worldNames.add("world_the_end");
} }
def.put("loggedWorlds", worldNames); def.put("loggedWorlds", worldNames);
def.put("mysql.protocol", "mysql");
def.put("mysql.host", "localhost"); def.put("mysql.host", "localhost");
def.put("mysql.port", 3306); def.put("mysql.port", 3306);
def.put("mysql.database", "minecraft"); def.put("mysql.database", "minecraft");
@ -179,7 +180,7 @@ public class Config {
boolean oldConfig = configVersion.compareTo(new ComparableVersion(CURRENT_CONFIG_VERSION)) < 0; boolean oldConfig = configVersion.compareTo(new ComparableVersion(CURRENT_CONFIG_VERSION)) < 0;
mysqlDatabase = getStringIncludingInts(config, "mysql.database"); mysqlDatabase = getStringIncludingInts(config, "mysql.database");
url = "jdbc:mysql://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + mysqlDatabase; url = "jdbc:" + config.getString("mysql.protocol") + "://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + mysqlDatabase;
user = getStringIncludingInts(config, "mysql.user"); user = getStringIncludingInts(config, "mysql.user");
password = getStringIncludingInts(config, "mysql.password"); password = getStringIncludingInts(config, "mysql.password");
mysqlUseSSL = config.getBoolean("mysql.useSSL", true); mysqlUseSSL = config.getBoolean("mysql.useSSL", true);