Skip to content

Commit a39e18e

Browse files
committed
Added redis auth support
1 parent ea033d0 commit a39e18e

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>io.alerium.chocolate</groupId>
88
<artifactId>parent</artifactId>
99
<packaging>pom</packaging>
10-
<version>1.1.0-SNAPSHOT</version>
10+
<version>1.1.1-SNAPSHOT</version>
1111

1212
<modules>
1313
<module>velocity</module>

spigot/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>parent</artifactId>
99
<groupId>io.alerium.chocolate</groupId>
10-
<version>1.1.0-SNAPSHOT</version>
10+
<version>1.1.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>spigot</artifactId>

velocity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.alerium.chocolate</groupId>
99
<artifactId>parent</artifactId>
10-
<version>1.1.0-SNAPSHOT</version>
10+
<version>1.1.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>velocity</artifactId>

velocity/src/main/java/io/alerium/chocolate/velocity/redis/RedisManager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class RedisManager {
2020

2121
private PubSubListener psListener;
2222

23+
private String redisPassword;
2324
@Getter private String proxyName;
2425
@Getter private int onlinePlayers;
2526

@@ -30,6 +31,7 @@ public class RedisManager {
3031
*/
3132
public void enable() {
3233
JsonObject redisConfig = plugin.getConfig().getObject().getAsJsonObject("redis");
34+
redisPassword = redisConfig.has("password") ? redisConfig.get("password").getAsString() : null;
3335
pool = new JedisPool(new JedisPoolConfig(), redisConfig.get("hostname").getAsString(), redisConfig.get("port").getAsInt());
3436

3537
psListener = new PubSubListener(plugin);
@@ -192,7 +194,10 @@ public void unregisterChannel(String... channels) {
192194
}
193195

194196
private Jedis getConnection() {
195-
return pool.getResource();
197+
Jedis jedis = pool.getResource();
198+
if (redisPassword != null && !redisPassword.isEmpty())
199+
jedis.auth(redisPassword);
200+
return jedis;
196201
}
197202

198203
}

velocity/src/main/resources/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"redis": {
33
"hostname": "localhost",
4-
"port": 6379
4+
"port": 6379,
5+
"password": ""
56
},
67

78
"proxyName": "proxy1",

0 commit comments

Comments
 (0)