Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check both site and global setting for s3 enabled value.

This commit is contained in:
Vinoth Kannan 2019-05-01 10:49:53 +05:30
parent c6409fd2cc
commit 9c78c18256
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/regular/update_s3_inventory.rb
View File

@ -5,7 +5,7 @@ module Jobs
class UpdateS3Inventory < Jobs::Base
def execute(args)
return unless SiteSetting.enable_s3_inventory? && SiteSetting.enable_s3_uploads?
return unless SiteSetting.enable_s3_inventory? && SiteSetting.Upload.enable_s3_uploads
[:upload, :optimized].each do |type|
s3_inventory = S3Inventory.new(Discourse.store.s3_helper, type)