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

DEV: Fix build

Browse Source 
Rails.logger is not available when Discourse.deprecate is called from
enabled_site_setting_filter.

Follow up to db4601823546b7a1451b82a6f556a30a55166a21.
This commit is contained in:
Bianca Nenciu
2020-05-10 15:05:23 +03:00
parent 8149bfbaf1
commit 09caf614de
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/discourse.rb
View File

@ -801,7 +801,7 @@ module Discourse
redis_key = "deprecate-notice-#{digest}" redis_key = "deprecate-notice-#{digest}"
if !Discourse.redis.without_namespace.get(redis_key) if !Discourse.redis.without_namespace.get(redis_key)
Rails.logger.warn(warning) if Rails.logger Rails.logger.warn(warning)
begin begin
Discourse.redis.without_namespace.setex(redis_key, 3600, "x") Discourse.redis.without_namespace.setex(redis_key, 3600, "x")
rescue Redis::CommandError => e rescue Redis::CommandError => e

2
lib/plugin/instance.rb
View File

@ -626,7 +626,7 @@ class Plugin::Instance
end end
def enabled_site_setting_filter(filter = nil) def enabled_site_setting_filter(filter = nil)
Discourse.deprecate("`enabled_site_setting_filter` is deprecated", output_in_test: true) STDERR.puts("`enabled_site_setting_filter` is deprecated")
end end
def enabled_site_setting(setting = nil) def enabled_site_setting(setting = nil)