github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

DEV: Align S3 transfer acceleration global settings (#24302)

Browse Source 
Followup to fe05fdae24

For consistency with other S3 settings, make the global setting
the same name as the site setting and use SiteSetting.Upload
too so it reads from the correct place.
This commit is contained in:
Martin Brennan 2023-11-10 09:50:23 +10:00 committed by GitHub
parent 36ab7ff2a9
commit 731dffdf92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/site_setting.rb
View File

@ -158,6 +158,14 @@ class SiteSetting < ActiveRecord::Base
SiteSetting.enable_s3_uploads ? SiteSetting.s3_endpoint : GlobalSetting.s3_endpoint SiteSetting.enable_s3_uploads ? SiteSetting.s3_endpoint : GlobalSetting.s3_endpoint
end end
def self.enable_s3_transfer_acceleration
if SiteSetting.enable_s3_uploads
SiteSetting.enable_s3_transfer_acceleration
else
GlobalSetting.enable_s3_transfer_acceleration
end
end
def self.enable_s3_uploads def self.enable_s3_uploads
SiteSetting.enable_s3_uploads || GlobalSetting.use_s3? SiteSetting.enable_s3_uploads || GlobalSetting.use_s3?
end end

2
config/discourse_defaults.conf
View File

@ -225,7 +225,7 @@ s3_cdn_url =
s3_endpoint = s3_endpoint =
s3_http_continue_timeout = s3_http_continue_timeout =
s3_install_cors_rule = s3_install_cors_rule =
s3_enable_transfer_acceleration = enable_s3_transfer_acceleration =
# Optionally, specify a separate CDN to be used for static JS assets stored on S3 # Optionally, specify a separate CDN to be used for static JS assets stored on S3
s3_asset_cdn_url = s3_asset_cdn_url =

2
lib/file_store/s3_store.rb
View File

@ -25,7 +25,7 @@ module FileStore
S3Helper.new( S3Helper.new(
s3_bucket, s3_bucket,
Rails.configuration.multisite ? multisite_tombstone_prefix : TOMBSTONE_PREFIX, Rails.configuration.multisite ? multisite_tombstone_prefix : TOMBSTONE_PREFIX,
use_accelerate_endpoint: SiteSetting.enable_s3_transfer_acceleration, use_accelerate_endpoint: SiteSetting.Upload.enable_s3_transfer_acceleration,
) )
end end

11
lib/s3_helper.rb
View File

@ -47,15 +47,8 @@ class S3Helper
setting_klass = use_db_s3_config ? SiteSetting : GlobalSetting setting_klass = use_db_s3_config ? SiteSetting : GlobalSetting
options = S3Helper.s3_options(setting_klass) options = S3Helper.s3_options(setting_klass)
options[:client] = s3_client if s3_client.present? options[:client] = s3_client if s3_client.present?
use_accelerate_endpoint = options[:use_accelerate_endpoint] = !for_backup &&
( SiteSetting.Upload.enable_s3_transfer_acceleration
if use_db_s3_config
SiteSetting.enable_s3_transfer_acceleration
else
GlobalSetting.s3_enable_transfer_acceleration
end
)
options[:use_accelerate_endpoint] = !for_backup && use_accelerate_endpoint
bucket = bucket =
if for_backup if for_backup