Add ability to set prefix for redis channels

BenCodez · Feb 24, 2024 · c442cd1 · c442cd1
1 parent 770e3e8
commit c442cd1
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 7 deletions.
diff --git a/VotingPlugin/Resources/BungeeSettings.yml b/VotingPlugin/Resources/BungeeSettings.yml
@@ -23,6 +23,8 @@ Redis:
   Port: 6379
   Username: ''
   Password: ''
+  # Set a prefix from an entire proxy network if using mutli-proxy setup below
+  Prefix: ''
 
 # Enables more debug messages for communication between servers
 # Use /votingpluginbungee status for testing communication

diff --git a/VotingPlugin/Resources/bungeeconfig.yml b/VotingPlugin/Resources/bungeeconfig.yml
@@ -91,6 +91,8 @@ Redis:
   Port: 6379
   Username: ''
   Password: ''
+  # Set a prefix from an entire proxy network if using mutli-proxy setup below
+  Prefix: ''
 
 # If false, votes will be checked if user is a valid player that has joined to server
 # Works for PLUGINMESSAGING and SOCKETS methods only

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/BungeeHandler.java b/VotingPlugin/src/com/bencodez/votingplugin/BungeeHandler.java
@@ -291,7 +291,8 @@ public void sendMessage(String subChannel, String... messageData) {
 					ArrayList<String> list = new ArrayList<String>();
 					list.add(subChannel);
 					list.addAll(ArrayUtils.getInstance().convert(messageData));
-					redisHandler.sendMessage("VotingPlugin", ArrayUtils.getInstance().convert(list));
+					redisHandler.sendMessage(plugin.getBungeeSettings().getRedisPrefix() + "VotingPlugin",
+							ArrayUtils.getInstance().convert(list));
 				}
 			}
 		};
@@ -626,8 +627,9 @@ public void debug(String message) {
 				@Override
 				public void run() {
 					if (plugin.isEnabled()) {
-						redisHandler.loadListener(new RedisListener(redisHandler,
-								"VotingPlugin_" + plugin.getBungeeSettings().getServer()));
+						redisHandler.loadListener(
+								new RedisListener(redisHandler, plugin.getBungeeSettings().getRedisPrefix()
+										+ "VotingPlugin_" + plugin.getBungeeSettings().getServer()));
 					}
 				}
 			});

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/Config.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/Config.java
@@ -33,6 +33,10 @@ public String getRedisUsername() {
 		return getData().getString("Redis.Username", "");
 	}
 
+	public String getRedisPrefix() {
+		return getData().getString("Redis.Prefix", "");
+	}
+
 	public String getRedisPassword() {
 		return getData().getString("Redis.Password", "");
 	}

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java
@@ -898,7 +898,8 @@ public void debug(String message) {
 
 					@Override
 					public void run() {
-						redisHandler.loadListener(new RedisListener(redisHandler, "VotingPlugin"));
+						redisHandler.loadListener(
+								new RedisListener(redisHandler, getConfig().getRedisPrefix() + "VotingPlugin"));
 					}
 				});
 
@@ -1255,7 +1256,8 @@ public void sendRedisMessageServer(String server, String channel, String... mess
 		ArrayList<String> list = new ArrayList<String>();
 		list.add(channel);
 		list.addAll(ArrayUtils.getInstance().convert(messageData));
-		redisHandler.sendMessage("VotingPlugin_" + server, ArrayUtils.getInstance().convert(list));
+		redisHandler.sendMessage(getConfig().getRedisPrefix() + "VotingPlugin_" + server,
+				ArrayUtils.getInstance().convert(list));
 	}
 
 	public void sendPluginMessageServer(String server, String channel, String... messageData) {

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/Config.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/Config.java
@@ -64,6 +64,10 @@ public int getRedisPort() {
 	public String getRedisUsername() {
 		return getString(getNode("Redis", "Username"), "");
 	}
+
+	public String getRedisPrefix() {
+		return getString(getNode("Redis", "Prefix"), "");
+	}
 
 	public String getRedisPassword() {
 		return getString(getNode("Redis", "Password"), "");

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java
@@ -989,7 +989,8 @@ public void debug(String message) {
 				};
 
 				server.getScheduler().buildTask(this, () -> {
-					redisHandler.loadListener(new RedisListener(redisHandler, "VotingPlugin"));
+					redisHandler.loadListener(
+							new RedisListener(redisHandler, getConfig().getRedisPrefix() + "VotingPlugin"));
 				}).schedule();
 
 			}
@@ -1304,7 +1305,8 @@ public void sendRedisMessageServer(RegisteredServer s, String channel, String...
 		ArrayList<String> list = new ArrayList<String>();
 		list.add(channel);
 		list.addAll(ArrayUtils.getInstance().convert(messageData));
-		redisHandler.sendMessage("VotingPlugin_" + s.getServerInfo().getName(), ArrayUtils.getInstance().convert(list));
+		redisHandler.sendMessage(getConfig().getRedisPrefix() + "VotingPlugin_" + s.getServerInfo().getName(),
+				ArrayUtils.getInstance().convert(list));
 	}
 
 	public void sendPluginMessageServer(RegisteredServer s, String channel, String... messageData) {

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/config/BungeeSettings.java b/VotingPlugin/src/com/bencodez/votingplugin/config/BungeeSettings.java
@@ -39,6 +39,10 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private String RedisUsername = "";
 
+	@ConfigDataString(path = "Redis.Prefix")
+	@Getter
+	private String RedisPrefix = "";
+
 	@ConfigDataString(path = "Redis.Password")
 	@Getter
 	private String RedisPassword = "";