From afab30329221ba4417f3ec3ba19b43ca6259420c Mon Sep 17 00:00:00 2001 From: Govindas Date: Sat, 24 Oct 2020 12:35:35 +0300 Subject: [PATCH] change useSSL to useTLS, because redis itself refers to it as TLS --- .../java/net/limework/core/managers/RedisManager.java | 2 +- .../net/limework/core/skript/elements/EffSendMessage.java | 2 +- src/main/resources/config.yml | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/limework/core/managers/RedisManager.java b/src/main/java/net/limework/core/managers/RedisManager.java index 39a95d8..4d324c8 100644 --- a/src/main/java/net/limework/core/managers/RedisManager.java +++ b/src/main/java/net/limework/core/managers/RedisManager.java @@ -48,7 +48,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable { config.getInt("Redis.Port"), config.getInt("Redis.TimeOut"), config.getString("Redis.Password"), - config.getBoolean("Redis.useSSL")); + config.getBoolean("Redis.useTLS")); RedisService = Executors.newFixedThreadPool(config.getInt("Redis.Threads")); try { this.subscribeJedis = this.jedisPool.getResource(); diff --git a/src/main/java/net/limework/core/skript/elements/EffSendMessage.java b/src/main/java/net/limework/core/skript/elements/EffSendMessage.java index 6afbf8a..1e1725f 100644 --- a/src/main/java/net/limework/core/skript/elements/EffSendMessage.java +++ b/src/main/java/net/limework/core/skript/elements/EffSendMessage.java @@ -63,7 +63,7 @@ public class EffSendMessage extends Effect { @Override public String toString(Event event, boolean b) { - return "send redis message to channel " + channel.getSingle(event) + " with message " + message.getSingle(event); + return "send redis message " + message.getSingle(event) + " to channel " + channel.getSingle(event); } @SuppressWarnings("unchecked") diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index b40b84b..e1db3a4 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -10,10 +10,12 @@ Redis: #time out in milliseconds, how long it should take before it decides that it is unable to connect when sending a message #90000 = 90 seconds TimeOut: 90000 - #also known as TLS, only use this if you're running Redis 6.0.6 or higher, older versions will not work correctly - useSSL: false - #may be useful if you cannot use SSL due to use of older version of Redis + #also known as SSL, only use this if you're running Redis 6.0.6 or higher, older versions will not work correctly + #it encrypts your traffic and makes data exchange between distant servers completely secure + useTLS: false + #may be useful if you cannot use TLS due to use of older version of Redis #however this will not encrypt the initial authentication password, only the messages sent + #it uses AES-128 SIV encryption which is secure enough for this EncryptMessages: true EncryptionKey: "16CHARACTERS KEY" MacKey: "16CHARACTERS KEY"