@@ -6,7 +6,7 @@ module.exports = CoreObject.extend({
66 init : function ( options , lib ) {
77 this . _super ( ) ;
88 var redisOptions = { } ;
9- var redisLib = lib ;
9+ var RedisLib = lib ;
1010
1111 if ( options . url ) {
1212 redisOptions = this . _stripUsernameFromConfigUrl ( options . url ) ;
@@ -21,15 +21,15 @@ module.exports = CoreObject.extend({
2121 }
2222
2323 if ( options . database ) {
24- redisOptions . database = options . database ;
24+ redisOptions . db = options . database ;
2525 }
2626 }
2727
28- if ( ! redisLib ) {
29- redisLib = require ( 'then-redis ' ) ;
28+ if ( ! RedisLib ) {
29+ RedisLib = require ( 'ioredis ' ) ;
3030 }
3131
32- this . _client = redisLib . createClient ( redisOptions ) ;
32+ this . _client = new RedisLib ( redisOptions ) ;
3333
3434 this . _maxRecentUploads = options . maxRecentUploads ;
3535 this . _allowOverwrite = options . allowOverwrite ;
@@ -204,13 +204,16 @@ module.exports = CoreObject.extend({
204204 if ( ! revisions ) {
205205 return ;
206206 }
207+ var promises = [ ] ;
207208 revisions . forEach ( function ( revision ) {
208209 if ( revision !== current ) {
209- client . del ( keyPrefix + ":" + revision ) ;
210- client . del ( keyPrefix + ":revision-data:" + revision ) ;
211- client . zrem ( listKey , revision ) ;
210+ promises . push ( client . del ( keyPrefix + ":" + revision ) ) ;
211+ promises . push ( client . del ( keyPrefix + ":revision-data:" + revision ) ) ;
212+ promises . push ( client . zrem ( listKey , revision ) ) ;
212213 }
213214 } ) ;
215+
216+ return RSVP . all ( promises ) ;
214217 } ) ;
215218 } ,
216219
0 commit comments