Fascinated/McGamerZone
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Added a field in JedisConstants for the selected Redis database.

Browse Source
This commit is contained in:
Nicholas Rees 2021-05-06 14:47:47 -05:00
parent 35641226a1
commit 184d6a2be4
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
serverdata/src/main/java/zone/themcgamer/data/jedis/JedisConstants.java
View File

@ -6,4 +6,5 @@ package zone.themcgamer.data.jedis;
public class JedisConstants { public class JedisConstants {
public static final String HOST = "172.18.0.1"; public static final String HOST = "172.18.0.1";
public static final String AUTH = "CWhsuGvpYPhZt7ru"; public static final String AUTH = "CWhsuGvpYPhZt7ru";
public static final int SELECTED_DB = 0;
} }

1
serverdata/src/main/java/zone/themcgamer/data/jedis/cache/CacheRepository.java vendored
View File

@ -53,6 +53,7 @@ public class CacheRepository extends RedisRepository<String, ICacheItem<?>> {
List<ICacheItem<?>> cached = new ArrayList<>(); List<ICacheItem<?>> cached = new ArrayList<>();
try (Jedis jedis = getController().getPool().getResource()) { try (Jedis jedis = getController().getPool().getResource()) {
jedis.auth(JedisConstants.AUTH); jedis.auth(JedisConstants.AUTH);
jedis.select(JedisConstants.SELECTED_DB);
for (ItemCacheType cacheType : ItemCacheType.values()) { for (ItemCacheType cacheType : ItemCacheType.values()) {
for (String key : jedis.keys(cacheType.getIdentifier() + ":*")) { for (String key : jedis.keys(cacheType.getIdentifier() + ":*")) {
Map<String, String> map = jedis.hgetAll(key); Map<String, String> map = jedis.hgetAll(key);

2
serverdata/src/main/java/zone/themcgamer/data/jedis/command/JedisCommandHandler.java
View File

@ -35,6 +35,7 @@ public class JedisCommandHandler {
new Thread(() -> { new Thread(() -> {
try (Jedis jedis = pool.getResource()) { try (Jedis jedis = pool.getResource()) {
jedis.auth(JedisConstants.AUTH); jedis.auth(JedisConstants.AUTH);
jedis.select(JedisConstants.SELECTED_DB);
jedis.psubscribe(new JedisPubSub() { jedis.psubscribe(new JedisPubSub() {
@Override @Override
public void onPMessage(String pattern, String channel, String message) { public void onPMessage(String pattern, String channel, String message) {
@ -80,6 +81,7 @@ public class JedisCommandHandler {
System.out.println("Dispatching Redis command for class \"" + className + "\" with json \"" + json + "\""); System.out.println("Dispatching Redis command for class \"" + className + "\" with json \"" + json + "\"");
try (Jedis jedis = pool.getResource()) { try (Jedis jedis = pool.getResource()) {
jedis.auth(JedisConstants.AUTH); jedis.auth(JedisConstants.AUTH);
jedis.select(JedisConstants.SELECTED_DB);
jedis.publish("mcGamerZone:commands:" + className, json); jedis.publish("mcGamerZone:commands:" + className, json);
} }
} }

3
serverdata/src/main/java/zone/themcgamer/data/jedis/repository/RedisRepository.java
View File

@ -113,6 +113,7 @@ public abstract class RedisRepository<I, T> {
map.put(entry.getKey(), entry.getValue().toString()); map.put(entry.getKey(), entry.getValue().toString());
try (Jedis jedis = controller.getPool().getResource()) { try (Jedis jedis = controller.getPool().getResource()) {
jedis.auth(JedisConstants.AUTH); jedis.auth(JedisConstants.AUTH);
jedis.select(JedisConstants.SELECTED_DB);
jedis.hmset(key, map); jedis.hmset(key, map);
long expiration = getExpiration(t); long expiration = getExpiration(t);
@ -133,6 +134,7 @@ public abstract class RedisRepository<I, T> {
throw new IllegalArgumentException("Cannot remove, the key is null or empty: \"" + (key == null ? "null" : key) + "\""); throw new IllegalArgumentException("Cannot remove, the key is null or empty: \"" + (key == null ? "null" : key) + "\"");
try (Jedis jedis = controller.getPool().getResource()) { try (Jedis jedis = controller.getPool().getResource()) {
jedis.auth(JedisConstants.AUTH); jedis.auth(JedisConstants.AUTH);
jedis.select(JedisConstants.SELECTED_DB);
jedis.del(key); jedis.del(key);
} }
} }
@ -147,6 +149,7 @@ public abstract class RedisRepository<I, T> {
List<T> cached = new ArrayList<>(); List<T> cached = new ArrayList<>();
try (Jedis jedis = controller.getPool().getResource()) { try (Jedis jedis = controller.getPool().getResource()) {
jedis.auth(JedisConstants.AUTH); jedis.auth(JedisConstants.AUTH);
jedis.select(JedisConstants.SELECTED_DB);
Set<String> keys = jedis.keys(pattern); Set<String> keys = jedis.keys(pattern);
for (String key : keys) { for (String key : keys) {
Map<String, String> data = jedis.hgetAll(key); Map<String, String> data = jedis.hgetAll(key);