Authenticate when creating the ConnectionPool

feat/data-edit-commands
William 3 years ago
parent 027ee0dbbb
commit 7d46ce076b

@ -23,7 +23,18 @@ public abstract class RedisListener {
* Creates a new RedisListener and initialises the Redis connection * Creates a new RedisListener and initialises the Redis connection
*/ */
public RedisListener() { public RedisListener() {
jedisPool = new JedisPool(new JedisPoolConfig(), Settings.redisHost, Settings.redisPort); if (Settings.redisPassword.isEmpty()) {
jedisPool = new JedisPool(new JedisPoolConfig(),
Settings.redisHost,
Settings.redisPort,
0);
} else {
jedisPool = new JedisPool(new JedisPoolConfig(),
Settings.redisHost,
Settings.redisPort,
0,
Settings.redisPassword);
}
} }
/** /**
@ -54,12 +65,8 @@ public abstract class RedisListener {
* Start the Redis listener * Start the Redis listener
*/ */
public final void listen() { public final void listen() {
final String jedisPassword = Settings.redisPassword;
new Thread(() -> { new Thread(() -> {
try (Jedis jedis = getJedisConnection()) { try (Jedis jedis = getJedisConnection()) {
if (!jedisPassword.equals("")) {
jedis.auth(jedisPassword);
}
if (jedis.isConnected()) { if (jedis.isConnected()) {
isActiveAndEnabled = true; isActiveAndEnabled = true;
log(Level.INFO, "Enabled Redis listener successfully!"); log(Level.INFO, "Enabled Redis listener successfully!");

@ -65,11 +65,6 @@ public class RedisMessage {
*/ */
public void send() throws IOException { public void send() throws IOException {
try (Jedis publisher = RedisListener.getJedisConnection()) { try (Jedis publisher = RedisListener.getJedisConnection()) {
final String jedisPassword = Settings.redisPassword;
publisher.connect();
if (!jedisPassword.equals("")) {
publisher.auth(jedisPassword);
}
publisher.publish(REDIS_CHANNEL, getFullMessage()); publisher.publish(REDIS_CHANNEL, getFullMessage());
} }
} }

Loading…
Cancel
Save