Merge branch 'named-maps-tiles' into standalone-server

Conflicts: app.js
2015-07-06 02:55:13 +02:00
parent 69fc367f69 feec7805af
commit ccd3d0a3bf
9 changed files with 74 additions and 8 deletions
@@ -57,7 +57,9 @@ module.exports = function(serverOptions) {
    // Make stats client globally accessible
    global.statsClient = windshaft.stats.Client.getInstance(serverOptions.statsd);

-    var redisPool = new RedisPool(_.extend(serverOptions.redis, {name: 'windshaft:server'}));
+    var redisPool = new RedisPool(
+        _.extend(serverOptions.redis, { name: 'windshaft:server', unwatchOnRelease: false, noReadyCheck: true})
+    );

    redisPool.on('status', function(status) {
        var keyPrefix = 'windshaft.redis-pool.' + status.name + '.db' + status.db + '.';