kai1846456/RediSkript
1
0
Fork 0
forked from Limework/RediSkript
Code Pull Requests Activity

so I found that this threadpool was actually needed, oops

Browse Source 
due to it not having threadpool, froze my server at one point
This commit is contained in:
Govindass 2020-11-02 14:14:38 +02:00
parent 211a45ee52
commit 5a4943bd9d
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.limework.core</groupId> <groupId>net.limework.rediskript</groupId>
<artifactId>RediSkript</artifactId> <artifactId>RediSkript</artifactId>
<version>1.2.2</version> <version>1.2.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>

4
src/main/java/net/limework/rediskript/managers/RedisManager.java
View File

@ -52,7 +52,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
config.getInt("Redis.TimeOut"), config.getInt("Redis.TimeOut"),
config.getString("Redis.Password"), config.getString("Redis.Password"),
config.getBoolean("Redis.useTLS")); config.getBoolean("Redis.useTLS"));
RedisService = Executors.newSingleThreadExecutor(); RedisService = Executors.newFixedThreadPool(3);
try { try {
this.subscribeJedis = this.jedisPool.getResource(); this.subscribeJedis = this.jedisPool.getResource();
} catch (Exception ignored) { } catch (Exception ignored) {
@ -163,4 +163,6 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
public Encryption getEncryption() { public Encryption getEncryption() {
return encryption; return encryption;
} }
public ExecutorService getRedisService() { return RedisService; }
} }

4
src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
View File

@ -49,17 +49,17 @@ public class EffSendMessage extends Effect {
json.put("Date", System.currentTimeMillis()); //for unique string every time & PING calculations json.put("Date", System.currentTimeMillis()); //for unique string every time & PING calculations
byte[] msg; byte[] msg;
RedisManager manager = plugin.getRm(); RedisManager manager = plugin.getRm();
if (manager.getEncryption().isEncryptionEnabled()) { if (manager.getEncryption().isEncryptionEnabled()) {
msg = manager.getEncryption().encrypt(json.toString()); msg = manager.getEncryption().encrypt(json.toString());
} else { } else {
msg = json.toString().getBytes(StandardCharsets.UTF_8); msg = json.toString().getBytes(StandardCharsets.UTF_8);
} }
try { try {
manager.getRedisService().execute(() -> {
BinaryJedis j = manager.getJedisPool().getResource(); BinaryJedis j = manager.getJedisPool().getResource();
j.publish(channel.getBytes(StandardCharsets.UTF_8), msg); j.publish(channel.getBytes(StandardCharsets.UTF_8), msg);
j.close(); j.close();
});
} catch (JedisConnectionException exception) { } catch (JedisConnectionException exception) {
exception.printStackTrace(); exception.printStackTrace();
} }

2
src/main/resources/plugin.yml
View File

@ -1,4 +1,4 @@
main: net.limework.core.RediSkript main: net.limework.rediskript.RediSkript
name: RediSkript name: RediSkript
version: ${project.version} version: ${project.version}
authors: [Govindas, ham1255, DaemonicKing] authors: [Govindas, ham1255, DaemonicKing]