From 25ea0b3a5545a9e261a50404d2dd540fb5ba38cd Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 3 Dec 2019 11:01:02 +0100 Subject: [PATCH] DEV: uses Discourse.redis instead of $redis (#65) --- lib/docker_manager/git_repo.rb | 6 +++--- lib/docker_manager/upgrader.rb | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/docker_manager/git_repo.rb b/lib/docker_manager/git_repo.rb index f44d8ad..2cb0a16 100644 --- a/lib/docker_manager/git_repo.rb +++ b/lib/docker_manager/git_repo.rb @@ -12,15 +12,15 @@ class DockerManager::GitRepo end def start_upgrading - $redis.setnx(upgrade_key, latest_local_commit) + Discourse.redis.setnx(upgrade_key, latest_local_commit) end def stop_upgrading - $redis.del(upgrade_key) + Discourse.redis.del(upgrade_key) end def upgrade_version - @upgrade_version ||= $redis.get(upgrade_key) + @upgrade_version ||= Discourse.redis.get(upgrade_key) end def upgrading? diff --git a/lib/docker_manager/upgrader.rb b/lib/docker_manager/upgrader.rb index 0a3934f..d7fa8e8 100644 --- a/lib/docker_manager/upgrader.rb +++ b/lib/docker_manager/upgrader.rb @@ -173,11 +173,11 @@ class DockerManager::Upgrader end def clear_logs - $redis.del(logs_key) + Discourse.redis.del(logs_key) end def find_logs - $redis.get(logs_key) + Discourse.redis.get(logs_key) end def percent_key @@ -185,18 +185,18 @@ class DockerManager::Upgrader end def last_percentage - $redis.get(percent_key) + Discourse.redis.get(percent_key) end def percent(val) - $redis.set(percent_key, val) - $redis.expire(percent_key, 30.minutes) + Discourse.redis.set(percent_key, val) + Discourse.redis.expire(percent_key, 30.minutes) publish('percent', val) end def log(message) - $redis.append logs_key, message + "\n" - $redis.expire(logs_key, 30.minutes) + Discourse.redis.append logs_key, message + "\n" + Discourse.redis.expire(logs_key, 30.minutes) publish 'log', message end