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

Expose useSSL flag to config

Browse Source
This commit is contained in:
TheMolkaPL
2019-09-27 02:17:54 +02:00
committed by Brokkonaut
parent cd38ac9866
commit 921df872d1
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/diddiz/LogBlock/LogBlock.java
View File

@ -72,7 +72,7 @@ public class LogBlock extends JavaPlugin {
} }
try { try {
getLogger().info("Connecting to " + user + "@" + url + "..."); getLogger().info("Connecting to " + user + "@" + url + "...");
pool = new MySQLConnectionPool(url, user, password, mysqlRequireSSL); pool = new MySQLConnectionPool(url, user, password, mysqlUseSSL, mysqlRequireSSL);
final Connection conn = getConnection(true); final Connection conn = getConnection(true);
if (conn == null) { if (conn == null) {
noDb = true; noDb = true;

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

@ -25,6 +25,7 @@ public class Config {
private static LoggingEnabledMapping superWorldConfig; private static LoggingEnabledMapping superWorldConfig;
private static Map<String, WorldConfig> worldConfigs; private static Map<String, WorldConfig> worldConfigs;
public static String url, user, password; public static String url, user, password;
public static boolean mysqlUseSSL;
public static boolean mysqlRequireSSL; public static boolean mysqlRequireSSL;
public static int delayBetweenRuns, forceToProcessAtLeast, timePerRun; public static int delayBetweenRuns, forceToProcessAtLeast, timePerRun;
public static boolean fireCustomEvents; public static boolean fireCustomEvents;
@ -82,6 +83,7 @@ public class Config {
def.put("mysql.database", "minecraft"); def.put("mysql.database", "minecraft");
def.put("mysql.user", "username"); def.put("mysql.user", "username");
def.put("mysql.password", "pass"); def.put("mysql.password", "pass");
def.put("mysql.useSSL", true);
def.put("mysql.requireSSL", false); def.put("mysql.requireSSL", false);
def.put("consumer.delayBetweenRuns", 2); def.put("consumer.delayBetweenRuns", 2);
def.put("consumer.forceToProcessAtLeast", 200); def.put("consumer.forceToProcessAtLeast", 200);
@ -167,6 +169,7 @@ public class Config {
url = "jdbc:mysql://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + getStringIncludingInts(config, "mysql.database"); url = "jdbc:mysql://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + getStringIncludingInts(config, "mysql.database");
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);
mysqlRequireSSL = config.getBoolean("mysql.requireSSL", false); mysqlRequireSSL = config.getBoolean("mysql.requireSSL", false);
delayBetweenRuns = config.getInt("consumer.delayBetweenRuns", 2); delayBetweenRuns = config.getInt("consumer.delayBetweenRuns", 2);
forceToProcessAtLeast = config.getInt("consumer.forceToProcessAtLeast", 0); forceToProcessAtLeast = config.getInt("consumer.forceToProcessAtLeast", 0);

4
src/main/java/de/diddiz/util/MySQLConnectionPool.java
View File

@ -11,7 +11,7 @@ public class MySQLConnectionPool implements Closeable {
private final HikariDataSource ds; private final HikariDataSource ds;
public MySQLConnectionPool(String url, String user, String password, boolean requireSSL) { public MySQLConnectionPool(String url, String user, String password, boolean useSSL, boolean requireSSL) {
this.ds = new HikariDataSource(); this.ds = new HikariDataSource();
ds.setJdbcUrl(url); ds.setJdbcUrl(url);
ds.setUsername(user); ds.setUsername(user);
@ -30,7 +30,7 @@ public class MySQLConnectionPool implements Closeable {
ds.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); ds.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
ds.addDataSourceProperty("useServerPrepStmts", "true"); ds.addDataSourceProperty("useServerPrepStmts", "true");
ds.addDataSourceProperty("useSSL", "true"); ds.addDataSourceProperty("useSSL", Boolean.toString(useSSL));
ds.addDataSourceProperty("requireSSL", Boolean.toString(requireSSL)); ds.addDataSourceProperty("requireSSL", Boolean.toString(requireSSL));
ds.addDataSourceProperty("verifyServerCertificate", "false"); ds.addDataSourceProperty("verifyServerCertificate", "false");
} }