Sfoglia il codice sorgente

Merge pull request #8 from overleaf/ho-ioredis-default

make ioredis default
Henry Oswald 7 anni fa
parent
commit
c6bf123ccd

+ 3 - 6
libraries/redis-wrapper/index.coffee

@@ -6,9 +6,6 @@ module.exports = RedisSharelatex =
 		if !opts.retry_max_delay?
 			opts.retry_max_delay = 5000 # ms
 		
-		if opts.password?
-			opts.auth_pass = opts.password
-			delete opts.password
 		if opts.endpoints?
 			standardOpts = _.clone(opts)
 			delete standardOpts.endpoints
@@ -25,9 +22,9 @@ module.exports = RedisSharelatex =
 			RedisSharelatex._monkeyPatchIoredisExec(client)
 		else
 			standardOpts = _.clone(opts)
-			delete standardOpts.port
-			delete standardOpts.host
-			client = require("redis").createClient opts.port, opts.host, standardOpts
+			ioredis = require("ioredis")
+			client = new ioredis(standardOpts)
+			RedisSharelatex._monkeyPatchIoredisExec(client)
 			client.healthCheck = RedisSharelatex.singleInstanceHealthCheckBuilder(client)
 		return client
 	

+ 1 - 2
libraries/redis-wrapper/package.json

@@ -8,8 +8,7 @@
   "dependencies": {
     "async": "^2.5.0",
     "coffee-script": "1.8.0",
-    "ioredis": "~4.6.0",
-    "redis": "0.12.1",
+    "ioredis": "~4.9.1",
     "redis-sentinel": "0.1.1",
     "underscore": "1.7.0"
   },