github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove 'already initialized constant' warning

Browse Source
This commit is contained in:
Régis Hanol
2017-01-11 11:03:36 +01:00
parent d6bf5b0e78
commit dfb633fde3
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/discourse.rb
View File

@ -192,12 +192,12 @@ module Discourse
base_url_no_prefix + base_uri base_url_no_prefix + base_uri
end end
READONLY_MODE_KEY_TTL ||= 60 READONLY_MODE_KEY_TTL ||= 60
READONLY_MODE_KEY ||= 'readonly_mode'.freeze READONLY_MODE_KEY ||= 'readonly_mode'.freeze
PG_READONLY_MODE_KEY ||= 'readonly_mode:postgres'.freeze PG_READONLY_MODE_KEY ||= 'readonly_mode:postgres'.freeze
USER_READONLY_MODE_KEY ||= 'readonly_mode:user'.freeze USER_READONLY_MODE_KEY ||= 'readonly_mode:user'.freeze
READONLY_KEYS = [ READONLY_KEYS ||= [
READONLY_MODE_KEY, READONLY_MODE_KEY,
PG_READONLY_MODE_KEY, PG_READONLY_MODE_KEY,
USER_READONLY_MODE_KEY USER_READONLY_MODE_KEY
@ -234,9 +234,7 @@ module Discourse
end end
def self.readonly_mode? def self.readonly_mode?
return true if recently_readonly? recently_readonly? || READONLY_KEYS.any? { |key| !!$redis.get(key) }
READONLY_KEYS.each { |key| return true if !!$redis.get(key) }
false
end end
def self.last_read_only def self.last_read_only
@ -244,8 +242,7 @@ module Discourse
end end
def self.recently_readonly? def self.recently_readonly?
read_only = last_read_only[$redis.namespace] return false unless read_only = last_read_only[$redis.namespace]
return false unless read_only
read_only > 15.seconds.ago read_only > 15.seconds.ago
end end