Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-465 - Guard lettuce client shutdown during ConnectionFactory.destroy.

Browse Source 
We now guard and log errors during lettuce client shutdown when destroying the ConnectionFactory on ApplicationContext shutdown.
This commit is contained in:
Christoph Strobl
2016-02-17 16:06:48 +01:00
parent 30b06a9202
commit 0fa1319b8f
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
View File

@@ -40,6 +40,7 @@ import org.springframework.data.redis.connection.RedisNode;
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
import org.springframework.data.redis.connection.RedisSentinelConnection;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
import com.lambdaworks.redis.AbstractRedisClient;
@@ -147,8 +148,18 @@ public class LettuceConnectionFactory implements InitializingBean, DisposableBea
* @see org.springframework.beans.factory.DisposableBean#destroy()
*/
public void destroy() {
resetConnection();
client.shutdown(shutdownTimeout, shutdownTimeout, TimeUnit.MILLISECONDS);
try {
client.shutdown(shutdownTimeout, shutdownTimeout, TimeUnit.MILLISECONDS);
} catch (Exception e) {
if (log.isWarnEnabled()) {
log.warn((client != null ? ClassUtils.getShortName(client.getClass()) : "LettuceClient")
+ " did not shut down gracefully.", e);
}
}
if (clusterCommandExecutor != null) {