forked from Limework/RediSkript
		
	small fix to make sure the connect was killed
This commit is contained in:
		
							parent
							
								
									f4ab43bcb8
								
							
						
					
					
						commit
						5f4600546e
					
				
							
								
								
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    <groupId>net.limework.core</groupId>
 | 
					    <groupId>net.limework.core</groupId>
 | 
				
			||||||
    <artifactId>LimeworkSpigotCore</artifactId>
 | 
					    <artifactId>LimeworkSpigotCore</artifactId>
 | 
				
			||||||
    <version>1.0.3-fix1-SNAPSHOT</version>
 | 
					    <version>1.0.3-fix2-SNAPSHOT</version>
 | 
				
			||||||
    <packaging>jar</packaging>
 | 
					    <packaging>jar</packaging>
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
    <build>
 | 
					    <build>
 | 
				
			||||||
 | 
				
			|||||||
@ -32,6 +32,8 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
 | 
				
			|||||||
    private JedisPool jedisPool;
 | 
					    private JedisPool jedisPool;
 | 
				
			||||||
    private ExecutorService RedisService;
 | 
					    private ExecutorService RedisService;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private AtomicBoolean isKilled = new AtomicBoolean();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //sub
 | 
					    //sub
 | 
				
			||||||
    private BinaryJedis subscribeJedis;
 | 
					    private BinaryJedis subscribeJedis;
 | 
				
			||||||
@ -72,6 +74,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
 | 
				
			|||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public void run() {
 | 
					    public void run() {
 | 
				
			||||||
        while (!isShuttingDown.get()) {
 | 
					        while (!isShuttingDown.get()) {
 | 
				
			||||||
 | 
					            isKilled.set(false);
 | 
				
			||||||
            try {
 | 
					            try {
 | 
				
			||||||
                message("&e[Jedis] &cConnecting to redis...........");
 | 
					                message("&e[Jedis] &cConnecting to redis...........");
 | 
				
			||||||
                if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
 | 
					                if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
 | 
				
			||||||
@ -110,6 +113,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
 | 
				
			|||||||
            } catch (InterruptedException e) {
 | 
					            } catch (InterruptedException e) {
 | 
				
			||||||
                e.printStackTrace();
 | 
					                e.printStackTrace();
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					            if (isKilled.get()) break;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -179,6 +183,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
 | 
				
			|||||||
                    , "&c&lYou can not execute this command!!!!!!")));
 | 
					                    , "&c&lYou can not execute this command!!!!!!")));
 | 
				
			||||||
            return true;
 | 
					            return true;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					        isKilled.set(true);
 | 
				
			||||||
        try {
 | 
					        try {
 | 
				
			||||||
            if (this.subscribeJedis != null) {
 | 
					            if (this.subscribeJedis != null) {
 | 
				
			||||||
                this.unsubscribe();
 | 
					                this.unsubscribe();
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user