Skip to content

Commit bf5b22c

Browse files
seurosseuros
committed
Fix Redis connection
1 parent d51d54a commit bf5b22c

File tree

12 files changed

+75
-75
lines changed

12 files changed

+75
-75
lines changed

‎app/controllers/alerts_controller.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ def create
2121
def index
2222
@alerts = []
2323
[:traction, :google_analytics].each do |type|
24-
count = REDIS.get(count_key(type))
24+
count = Redis.current.get(count_key(type))
2525
next if count.nil?
26-
@alerts << { type: type, count: count, data: REDIS.zrangebyscore(history_key(type), 0, Time.now.to_i, withscores: true) }
26+
@alerts << { type: type, count: count, data: Redis.current.zrangebyscore(history_key(type), 0, Time.now.to_i, withscores: true) }
2727
end
2828
end
2929

@@ -48,7 +48,7 @@ def get_alert
4848
def process_traction_alert(data)
4949
if can_report_traction?(data[:url])
5050
update_history
51-
REDIS.set(last_sent_key(:traction, data[:url]), Time.now.to_i)
51+
Redis.current.set(last_sent_key(:traction, data[:url]), Time.now.to_i)
5252
Notifier.alert_admin(:traction, data[:url], data[:message]).deliver
5353
end
5454
end
@@ -60,22 +60,22 @@ def process_google_analytics(data)
6060
if can_report_visitors?
6161
if data[:viewers] > ENV['SITE_VISITORS_MAX_ALERT_LIMIT']
6262
update_history
63-
REDIS.set(last_sent_key(:google_analytics), Time.now.to_i)
63+
Redis.current.set(last_sent_key(:google_analytics), Time.now.to_i)
6464
Notifier.alert_admin(:a_lot_of_visitors, data[:url], message).deliver!
6565
elsif data[:viewers] < ENV['SITE_VISITORS_MIN_ALERT_LIMIT']
6666
update_history
67-
REDIS.set(last_sent_key(:google_analytics), Time.now.to_i)
67+
Redis.current.set(last_sent_key(:google_analytics), Time.now.to_i)
6868
Notifier.alert_admin(:too_few_visitors, data[:url], message).deliver!
6969
end
7070
end
7171
end
7272

7373
def can_report_visitors?
74-
Time.at(REDIS.get(last_sent_key(:google_analytics)).to_i) < GA_VISITORS_ALERT_INTERVAL.ago
74+
Time.at(Redis.current.get(last_sent_key(:google_analytics)).to_i) < GA_VISITORS_ALERT_INTERVAL.ago
7575
end
7676

7777
def can_report_traction?(url)
78-
Time.at(REDIS.get(last_sent_key(:traction, url)).to_i) < TRACTION_ALERT_INTERVAL.ago
78+
Time.at(Redis.current.get(last_sent_key(:traction, url)).to_i) < TRACTION_ALERT_INTERVAL.ago
7979
end
8080

8181
def last_sent_key(type, subkey=nil)
@@ -93,10 +93,10 @@ def history_key(type)
9393
end
9494

9595
def update_stats
96-
REDIS.incr(count_key(@alert[:type]))
96+
Redis.current.incr(count_key(@alert[:type]))
9797
end
9898

9999
def update_history
100-
REDIS.zadd(history_key(@alert[:type]), Time.now.to_i, @alert[:data])
100+
Redis.current.zadd(history_key(@alert[:type]), Time.now.to_i, @alert[:data])
101101
end
102102
end

‎app/jobs/generate_top_users_composite.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ def perform
1414

1515
def cache_users
1616
users = User.top(108).map { |u| {u.username => u.thumbnail_url} }.to_json
17-
REDIS.set "top_users", users
17+
Redis.current.set 'top_users', users
1818
end
1919

2020
def cache_images
2121
IMAGE_PATH.mkpath
2222

23-
users = JSON.parse(REDIS.get("top_users"))
23+
users = JSON.parse(Redis.current.get('top_users'))
2424
users.each.with_index do |pair, i|
2525
username, url = pair.keys.first, pair.values.first
2626

‎app/jobs/process_team.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ def perform
99
when :recalculate
1010
if team.team_members.size <= 0
1111
team.destroy
12-
REDIS.zrem(Team::LEADERBOARD_KEY, team.id.to_s)
12+
Redis.current.zrem(Team::LEADERBOARD_KEY, team.id.to_s)
1313
else
1414
team.recalculate!
1515
if team.team_members.size < 3
16-
REDIS.zrem(Team::LEADERBOARD_KEY, team.id.to_s)
16+
Redis.current.zrem(Team::LEADERBOARD_KEY, team.id.to_s)
1717
else
18-
REDIS.zadd(Team::LEADERBOARD_KEY, team.score.to_f, team.id.to_s)
18+
Redis.current.zadd(Team::LEADERBOARD_KEY, team.score.to_f, team.id.to_s)
1919
end
2020
end
2121
when :reindex

‎app/models/event.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def generate_event(event_type, audience, data={}, drip_rate=:immediately)
2525
activity_feed_keys.each_with_index do |activity_feed_key, index|
2626
data.merge!({ channel: channels[index] }.with_indifferent_access)
2727
score_for_event = Time.now.to_f
28-
REDIS.zadd(activity_feed_key, score_for_event.to_f, data)
29-
count = REDIS.zcard(activity_feed_key)
30-
REDIS.zremrangebyrank(activity_feed_key, 0, count - TABLE_SIZE) if count > TABLE_SIZE
28+
Redis.current.zadd(activity_feed_key, score_for_event.to_f, data)
29+
count = Redis.current.zcard(activity_feed_key)
30+
Redis.current.zremrangebyrank(activity_feed_key, 0, count - TABLE_SIZE) if count > TABLE_SIZE
3131
end
3232
end
3333
end
@@ -57,7 +57,7 @@ def user_activity(user, from, to, limit, publish=false)
5757

5858
activity_feed_keys.each do |activity_feed_key|
5959
i = 1
60-
REDIS.zrangebyscore(activity_feed_key, from, to).each do |activity|
60+
Redis.current.zrangebyscore(activity_feed_key, from, to).each do |activity|
6161

6262
Rails.logger.warn("[EVAL:#{i}] Event#user_activity(user = #{user.inspect}, from = #{from.inspect}, limit = #{limit.inspect}, publish = #{publish.inspect}) set to eval activity = #{activity.inspect}") if ENV['DEBUG']
6363
i += 1

‎app/models/leaderboard_redis_rank.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module ClassMethods
88
def top(page = 1, total = 50, country=nil)
99
end_range = (page * total) - 1
1010
start_range = (end_range - total) + 1
11-
ids = REDIS.zrevrange(Team::LEADERBOARD_KEY, start_range, end_range)
11+
ids = Redis.current.zrevrange(Team::LEADERBOARD_KEY, start_range, end_range)
1212
Team.find(ids).sort_by(&:rank)
1313
end
1414
end
@@ -20,21 +20,21 @@ def next_highest_competitors(number = 2)
2020
def higher_competitors(number = 1)
2121
low = [rank - number - 1, 0].max
2222
high = [rank - 2, 0].max
23-
total_member_count >= 3 && rank-1 != low ? REDIS.zrevrange(Team::LEADERBOARD_KEY, low, high) : []
23+
total_member_count >= 3 && rank-1 != low ? Redis.current.zrevrange(Team::LEADERBOARD_KEY, low, high) : []
2424
end
2525

2626
def lower_competitors(number = 1)
2727
low = [rank, 0].max
2828
high = [rank + number - 1, 0].max
29-
total_member_count >= 3 && rank != high ? REDIS.zrevrange(Team::LEADERBOARD_KEY, low, high) : []
29+
total_member_count >= 3 && rank != high ? Redis.current.zrevrange(Team::LEADERBOARD_KEY, low, high) : []
3030
end
3131

3232
def next_lowest_competitors(number = 2)
3333
@lower_competitor ||= Team.find(lower_competitors(number)).sort_by(&:rank)
3434
end
3535

3636
def rank
37-
@rank ||= (REDIS.zrevrank(Team::LEADERBOARD_KEY, id.to_s) || -1).to_i + 1
37+
@rank ||= (Redis.current.zrevrank(Team::LEADERBOARD_KEY, id.to_s) || -1).to_i + 1
3838
end
3939

4040
end

‎app/models/lifecycle_marketing.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ def send_reminders_to_create_team
1717

1818
def send_reminders_to_invite_team_members
1919
key = 'email:team-reminders:teams-emailed'
20-
REDIS.del(key)
20+
Redis.current.del(key)
2121
valid_activity_users.where("team_document_id IS NOT NULL").where(remind_to_invite_team_members: nil).find_each do |user|
22-
unless REDIS.sismember(key, user.team_document_id) or Team.find(user.team_document_id).created_at < 1.week.ago
23-
REDIS.sadd key, user.team_document_id
22+
unless Redis.current.sismember(key, user.team_document_id) or Team.find(user.team_document_id).created_at < 1.week.ago
23+
Redis.current.sadd key, user.team_document_id
2424
Notifier.remind_to_invite_team_members(user.username).deliver
2525
end
2626
end

‎app/models/opportunity.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ def applicants
149149

150150
def viewed_by(viewer)
151151
epoch_now = Time.now.to_i
152-
REDIS.incr(impressions_key)
152+
Redis.current.incr(impressions_key)
153153
if viewer.is_a?(User)
154-
REDIS.zadd(user_views_key, epoch_now, viewer.id)
154+
Redis.current.zadd(user_views_key, epoch_now, viewer.id)
155155
else
156-
REDIS.zadd(user_anon_views_key, epoch_now, viewer)
156+
Redis.current.zadd(user_anon_views_key, epoch_now, viewer)
157157
end
158158
end
159159

@@ -171,13 +171,13 @@ def user_anon_views_key
171171

172172
def viewers(since = 0)
173173
epoch_now = Time.now.to_i
174-
viewer_ids = REDIS.zrevrange(user_views_key, since, epoch_now)
174+
viewer_ids = Redis.current.zrevrange(user_views_key, since, epoch_now)
175175
User.where(id: viewer_ids).all
176176
end
177177

178178
def total_views(epoch_since = 0)
179179
epoch_now = Time.now.to_i
180-
REDIS.zcount(user_views_key, epoch_since, epoch_now) + REDIS.zcount(user_anon_views_key, epoch_since, epoch_now)
180+
Redis.current.zcount(user_views_key, epoch_since, epoch_now) + Redis.current.zcount(user_anon_views_key, epoch_since, epoch_now)
181181
end
182182

183183
def team

‎app/models/protip.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -882,25 +882,25 @@ def topics_changed?
882882

883883
def viewed_by(viewer)
884884
epoch_now = Time.now.to_i
885-
REDIS.incr(impressions_key)
885+
Redis.current.incr(impressions_key)
886886
if viewer.is_a?(User)
887-
REDIS.zadd(user_views_key, epoch_now, viewer.id)
887+
Redis.current.zadd(user_views_key, epoch_now, viewer.id)
888888
generate_event(viewer: viewer.username) unless viewer_ids(5.minutes.ago.to_i).include? viewer.id.to_s
889889
index_search if viewer.admin?
890890
else
891-
REDIS.zadd(user_anon_views_key, epoch_now, viewer)
892-
count = REDIS.zcard(user_anon_views_key)
893-
REDIS.zremrangebyrank(user_anon_views_key, -(count - 100), -1) if count > 100
891+
Redis.current.zadd(user_anon_views_key, epoch_now, viewer)
892+
count = Redis.current.zcard(user_anon_views_key)
893+
Redis.current.zremrangebyrank(user_anon_views_key, -(count - 100), -1) if count > 100
894894
end
895895

896896
update_score! if (total_views % COUNTABLE_VIEWS_CHUNK) == 0
897897
end
898898

899899
def viewed_by?(viewer)
900900
if viewer.is_a?(User)
901-
!REDIS.zrank(user_views_key, viewer.id).nil?
901+
!Redis.current.zrank(user_views_key, viewer.id).nil?
902902
else
903-
!REDIS.zrank(user_anon_views_key, viewer).nil?
903+
!Redis.current.zrank(user_anon_views_key, viewer).nil?
904904
end
905905
end
906906

@@ -931,16 +931,16 @@ def viewers(since=0)
931931

932932
def viewer_ids(since=0)
933933
epoch_now = Time.now.to_i
934-
REDIS.zrangebyscore(user_views_key, since, epoch_now)
934+
Redis.current.zrangebyscore(user_views_key, since, epoch_now)
935935
end
936936

937937
def total_views(epoch_since = 0)
938938
if epoch_since.to_i == 0
939-
REDIS.get(impressions_key).to_i
939+
Redis.current.get(impressions_key).to_i
940940
else
941941
epoch_now = Time.now.to_i
942942
epoch_since = epoch_since.to_i
943-
REDIS.zcount(user_views_key, epoch_since, epoch_now) + REDIS.zcount(user_anon_views_key, epoch_since, epoch_now)
943+
Redis.current.zcount(user_views_key, epoch_since, epoch_now) + Redis.current.zcount(user_anon_views_key, epoch_since, epoch_now)
944944
end
945945
end
946946

‎app/models/team.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ def team_members_with_scores
631631
end
632632

633633
def log_history!
634-
REDIS.rpush("team:#{id.to_s}:score", {
634+
Redis.current.rpush("team:#{id.to_s}:score", {
635635
date: Date.today,
636636
score: self.score,
637637
size: self.size
@@ -686,27 +686,27 @@ def user_detail_views_key
686686

687687
def viewed_by(viewer)
688688
epoch_now = Time.now.to_i
689-
REDIS.incr(impressions_key)
689+
Redis.current.incr(impressions_key)
690690
if viewer.is_a?(User)
691-
REDIS.zadd(user_views_key, epoch_now, viewer.id)
691+
Redis.current.zadd(user_views_key, epoch_now, viewer.id)
692692
else
693-
REDIS.zadd(user_anon_views_key, epoch_now, viewer)
693+
Redis.current.zadd(user_anon_views_key, epoch_now, viewer)
694694
end
695695
end
696696

697697
def impressions
698-
REDIS.get(impressions_key).to_i
698+
Redis.current.get(impressions_key).to_i
699699
end
700700

701701
def viewers(since=0)
702702
epoch_now = Time.now.to_i
703-
viewer_ids = REDIS.zrevrangebyscore(user_views_key, epoch_now, since)
703+
viewer_ids = Redis.current.zrevrangebyscore(user_views_key, epoch_now, since)
704704
User.where(id: viewer_ids).all
705705
end
706706

707707
def total_views(epoch_since = 0)
708708
epoch_now = Time.now.to_i
709-
REDIS.zcount(user_views_key, epoch_since, epoch_now) + REDIS.zcount(user_anon_views_key, epoch_since, epoch_now)
709+
Redis.current.zcount(user_views_key, epoch_since, epoch_now) + Redis.current.zcount(user_anon_views_key, epoch_since, epoch_now)
710710
end
711711

712712
def followers
@@ -783,19 +783,19 @@ def all_jobs
783783
def record_exit(viewer, exit_url, exit_target_type, furthest_scrolled, time_spent)
784784
epoch_now = Time.now.to_i
785785
data = visitor_data(exit_url, exit_target_type, furthest_scrolled, time_spent, (viewer.respond_to?(:id) && viewer.try(:id)) || viewer, epoch_now, nil)
786-
REDIS.zadd(user_detail_views_key, epoch_now, data)
786+
Redis.current.zadd(user_detail_views_key, epoch_now, data)
787787
end
788788

789789
def detailed_visitors(since = 0)
790-
REDIS.zrangebyscore(user_detail_views_key, since, Time.now.to_i).map do |visitor_string|
790+
Redis.current.zrangebyscore(user_detail_views_key, since, Time.now.to_i).map do |visitor_string|
791791
visitor = HashStringParser.better_than_eval(visitor_string)
792792
visitor[:user] = identify_visitor(visitor[:user_id])
793793
visitor
794794
end
795795
end
796796

797797
def simple_visitors(since = 0)
798-
all_visitors = REDIS.zrangebyscore(user_views_key, since, Time.now.to_i, withscores: true) + REDIS.zrangebyscore(user_anon_views_key, since, Time.now.to_i, withscores: true)
798+
all_visitors = Redis.current.zrangebyscore(user_views_key, since, Time.now.to_i, withscores: true) + Redis.current.zrangebyscore(user_anon_views_key, since, Time.now.to_i, withscores: true)
799799
Hash[*all_visitors.flatten].collect do |viewer_id, timestamp|
800800
visitor_data(nil, nil, nil, 0, viewer_id, timestamp, identify_visitor(viewer_id))
801801
end

‎app/models/usage.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
class Usage
22
class << self
33
def page_view(user_id)
4-
REDIS.zadd(dated_key('view'), 1, user_id)
4+
Redis.current.zadd(dated_key('view'), 1, user_id)
55
end
66

77
def unique_visitors_on(date = Date.today)
8-
REDIS.zcount(dated_key('view', date), 1, 1000000)
8+
Redis.current.zcount(dated_key('view', date), 1, 1000000)
99
end
1010

1111
def top_ten_users_today
12-
ids = REDIS.zrevrange(dated_key('view'), 0, 10, withscores: true)
12+
ids = Redis.current.zrevrange(dated_key('view'), 0, 10, withscores: true)
1313
User.where(id: ids).all
1414
end
1515

0 commit comments

Comments
 (0)