diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-07-31 15:48:23 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-07-31 15:53:58 +0200 |
commit | 87df06171ebfdcab01f377e4e040f72b4ba3b013 (patch) | |
tree | bc75efea57c67280fd1a9675fb7131b026d5d8ce /config/initializers | |
parent | bdb4288ab82bab14619fe817020e90e48a97e1d4 (diff) | |
download | gitlab-ce-87df06171ebfdcab01f377e4e040f72b4ba3b013.tar.gz |
Bump redis-store to 1.1.6 and remove redid-store-fix-expiryredis-store
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/redis-store-fix-expiry.rb | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/config/initializers/redis-store-fix-expiry.rb b/config/initializers/redis-store-fix-expiry.rb deleted file mode 100644 index fce0a135330..00000000000 --- a/config/initializers/redis-store-fix-expiry.rb +++ /dev/null @@ -1,44 +0,0 @@ -# Monkey-patch Redis::Store to make 'setex' and 'expire' work with namespacing - -module Gitlab - class Redis - class Store - module Namespace - # Redis::Store#setex in redis-store 1.1.4 does not respect namespaces; - # this new method does. - def setex(key, expires_in, value, options=nil) - namespace(key) { |key| super(key, expires_in, value) } - end - - # Redis::Store#expire in redis-store 1.1.4 does not respect namespaces; - # this new method does. - def expire(key, expires_in) - namespace(key) { |key| super(key, expires_in) } - end - - private - - # Our new definitions of #setex and #expire above assume that the - # #namespace method exists. Because we cannot be sure of that, we - # re-implement the #namespace method from Redis::Store::Namespace so - # that it is available for all Redis::Store instances, whether they use - # namespacing or not. - # - # Based on lib/redis/store/namespace.rb L49-51 (redis-store 1.1.4) - def namespace(key) - if @namespace - yield interpolate(key) - else - # This Redis::Store instance does not use a namespace so we should - # just pass through the key. - yield key - end - end - end - end - end -end - -Redis::Store.class_eval do - include Gitlab::Redis::Store::Namespace -end |