Merge pull request #308 from swisspost/develop

PR for release

Author: mcweba

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.swisspush</groupId>
     <artifactId>redisques</artifactId>
-    <version>4.1.20-SNAPSHOT</version>
+    <version>4.1.21-SNAPSHOT</version>
     <name>redisques</name>
     <description>
         A highly scalable redis-persistent queuing system for vertx

src/main/java/org/swisspush/redisques/util/DefaultRedisProvider.java

@@ -115,6 +115,12 @@ private Future<RedisAPI> connectToRedis() {
                     .setMaxWaitingHandlers(redisMaxPipelineWaitingSize)
                     .setType(config.getRedisClientType());
 
+            if (config.getRedisEnableTls()) {
+                redisOptions.setNetClientOptions(redisOptions.getNetClientOptions()
+                        .setSsl(true)
+                        .setHostnameVerificationAlgorithm("HTTPS"));
+            }
+
             createConnectStrings().forEach(redisOptions::addConnectionString);
 
             redis = Redis.createClient(vertx, redisOptions);