Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-25 17:49:20 +00:00
Code Issues Releases 1 Activity

Add SSL connection option for Redis

Browse Source
This commit is contained in:
William
2022-01-21 00:57:16 +00:00
parent 920d2582f5
commit 6719858de1
7 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java
View File

@@ -12,6 +12,7 @@ public class ConfigLoader {
Settings.redisHost = config.getString("redis_settings.host", "localhost");
Settings.redisPort = config.getInt("redis_settings.port", 6379);
Settings.redisPassword = config.getString("redis_settings.password", "");
Settings.redisSSL = config.getBoolean("redis_settings.use_ssl", false);
Settings.syncInventories = config.getBoolean("synchronisation_settings.inventories", true);
Settings.syncEnderChests = config.getBoolean("synchronisation_settings.ender_chests", true);

1
bukkit/src/main/resources/config.yml
View File

@@ -2,6 +2,7 @@ redis_settings:
host: 'localhost'
port: 6379
password: ''
use_ssl: false
synchronisation_settings:
inventories: true
ender_chests: true

1
bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java
View File

@@ -42,6 +42,7 @@ public class ConfigLoader {
Settings.redisHost = config.getString("redis_settings.host", "localhost");
Settings.redisPort = config.getInt("redis_settings.port", 6379);
Settings.redisPassword = config.getString("redis_settings.password", "");
Settings.redisSSL = config.getBoolean("redis_settings.use_ssl", false);
Settings.dataStorageType = Settings.DataStorageType.valueOf(config.getString("data_storage_settings.database_type", "sqlite").toUpperCase());
if (Settings.dataStorageType == Settings.DataStorageType.MYSQL) {

1
common/src/main/java/me/william278/husksync/Settings.java
View File

@@ -21,6 +21,7 @@ public class Settings {
public static String redisHost;
public static int redisPort;
public static String redisPassword;
public static boolean redisSSL;
/*
* Bungee / Proxy server-only settings

6
common/src/main/java/me/william278/husksync/redis/RedisListener.java
View File

@@ -27,13 +27,15 @@ public abstract class RedisListener {
jedisPool = new JedisPool(new JedisPoolConfig(),
Settings.redisHost,
Settings.redisPort,
0);
0,
Settings.redisSSL);
} else {
jedisPool = new JedisPool(new JedisPoolConfig(),
Settings.redisHost,
Settings.redisPort,
0,
Settings.redisPassword);
Settings.redisPassword,
Settings.redisSSL);
}
}

1
common/src/main/resources/proxy-config.yml
View File

@@ -3,6 +3,7 @@ redis_settings:
host: 'localhost'
port: 6379
password: ''
use_ssl: false
data_storage_settings:
database_type: 'sqlite'
mysql_settings:

10
velocity/src/main/java/me/william278/husksync/velocity/config/ConfigLoader.java
View File

@@ -31,25 +31,24 @@ public class ConfigLoader {
}
private static String getConfigString(ConfigurationNode rootNode, String defaultValue, String... nodePath) {
return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[])nodePath).getString() : defaultValue;
return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[]) nodePath).getString() : defaultValue;
}
@SuppressWarnings("SameParameterValue")
private static boolean getConfigBoolean(ConfigurationNode rootNode, boolean defaultValue, String... nodePath) {
return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[])nodePath).getBoolean() : defaultValue;
return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[]) nodePath).getBoolean() : defaultValue;
}
private static int getConfigInt(ConfigurationNode rootNode, int defaultValue, String... nodePath) {
return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[])nodePath).getInt() : defaultValue;
return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[]) nodePath).getInt() : defaultValue;
}
private static long getConfigLong(ConfigurationNode rootNode, long defaultValue, String... nodePath) {
return !rootNode.getNode((Object[])nodePath).isVirtual() ? rootNode.getNode((Object[])nodePath).getLong() : defaultValue;
return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[]) nodePath).getLong() : defaultValue;
}
public static void loadSettings(ConfigurationNode loadedConfig) throws IllegalArgumentException {
ConfigurationNode config = copyDefaults(loadedConfig);
//ConfigurationNode config = copyDefaults(loadedConfig);
Settings.language = getConfigString(config, "en-gb", "language");
@@ -58,6 +57,7 @@ public class ConfigLoader {
Settings.redisHost = getConfigString(config, "localhost", "redis_settings", "host");
Settings.redisPort = getConfigInt(config, 6379, "redis_settings", "port");
Settings.redisPassword = getConfigString(config, "", "redis_settings", "password");
Settings.redisSSL = getConfigBoolean(config, false, "redis_settings", "use_ssl");
Settings.dataStorageType = Settings.DataStorageType.valueOf(getConfigString(config, "sqlite", "data_storage_settings", "database_type").toUpperCase());
if (Settings.dataStorageType == Settings.DataStorageType.MYSQL) {