mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
DEV: s/\$redis/Discourse\.redis (#8431)
This commit also adds a rubocop rule to prevent global variables.
This commit is contained in:
@@ -122,17 +122,17 @@ class BadgeGranter
|
||||
}
|
||||
end
|
||||
|
||||
$redis.lpush queue_key, payload.to_json if payload
|
||||
Discourse.redis.lpush queue_key, payload.to_json if payload
|
||||
end
|
||||
|
||||
def self.clear_queue!
|
||||
$redis.del queue_key
|
||||
Discourse.redis.del queue_key
|
||||
end
|
||||
|
||||
def self.process_queue!
|
||||
limit = 1000
|
||||
items = []
|
||||
while limit > 0 && item = $redis.lpop(queue_key)
|
||||
while limit > 0 && item = Discourse.redis.lpop(queue_key)
|
||||
items << JSON.parse(item)
|
||||
limit -= 1
|
||||
end
|
||||
|
||||
@@ -54,12 +54,12 @@ class GroupMessage
|
||||
|
||||
def sent_recently?
|
||||
return false if @opts[:limit_once_per] == false
|
||||
$redis.get(sent_recently_key).present?
|
||||
Discourse.redis.get(sent_recently_key).present?
|
||||
end
|
||||
|
||||
# default is to send no more than once every 24 hours (24 * 60 * 60 = 86,400 seconds)
|
||||
def remember_message_sent
|
||||
$redis.setex(sent_recently_key, @opts[:limit_once_per].try(:to_i) || 86_400, 1) unless @opts[:limit_once_per] == false
|
||||
Discourse.redis.setex(sent_recently_key, @opts[:limit_once_per].try(:to_i) || 86_400, 1) unless @opts[:limit_once_per] == false
|
||||
end
|
||||
|
||||
def sent_recently_key
|
||||
|
||||
@@ -40,9 +40,9 @@ class RandomTopicSelector
|
||||
key = cache_key(category)
|
||||
|
||||
if results.present?
|
||||
$redis.multi do
|
||||
$redis.rpush(key, results)
|
||||
$redis.expire(key, 2.days)
|
||||
Discourse.redis.multi do
|
||||
Discourse.redis.rpush(key, results)
|
||||
Discourse.redis.expire(key, 2.days)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -56,13 +56,13 @@ class RandomTopicSelector
|
||||
|
||||
return results if count < 1
|
||||
|
||||
results = $redis.multi do
|
||||
$redis.lrange(key, 0, count - 1)
|
||||
$redis.ltrim(key, count, -1)
|
||||
results = Discourse.redis.multi do
|
||||
Discourse.redis.lrange(key, 0, count - 1)
|
||||
Discourse.redis.ltrim(key, count, -1)
|
||||
end
|
||||
|
||||
if !results.is_a?(Array) # Redis is in readonly mode
|
||||
results = $redis.lrange(key, 0, count - 1)
|
||||
results = Discourse.redis.lrange(key, 0, count - 1)
|
||||
else
|
||||
results = results[0]
|
||||
end
|
||||
@@ -80,7 +80,7 @@ class RandomTopicSelector
|
||||
results = results[0...count]
|
||||
end
|
||||
|
||||
if !backfilled && $redis.llen(key) < BACKFILL_LOW_WATER_MARK
|
||||
if !backfilled && Discourse.redis.llen(key) < BACKFILL_LOW_WATER_MARK
|
||||
Scheduler::Defer.later("backfill") do
|
||||
backfill(category)
|
||||
end
|
||||
@@ -94,7 +94,7 @@ class RandomTopicSelector
|
||||
end
|
||||
|
||||
def self.clear_cache!
|
||||
$redis.delete_prefixed(cache_key)
|
||||
Discourse.redis.delete_prefixed(cache_key)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -35,7 +35,7 @@ class TopicTimestampChanger
|
||||
end
|
||||
|
||||
# Burst the cache for stats
|
||||
[AdminDashboardData, About].each { |klass| $redis.del klass.stats_cache_key }
|
||||
[AdminDashboardData, About].each { |klass| Discourse.redis.del klass.stats_cache_key }
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
Reference in New Issue
Block a user