Mike Dalessio
b07f592aaf
ActiveStorage::Record and ApplicationRecord used separate connection pools (from separate `connects_to` calls). This meant `belongs_to touch: true` on attachments silently failed — the card couldn't join the attachment's transaction to receive the deferred touch, so fragment caches were never invalidated after image removal. Fix by delegating `connection_pool` from ActiveStorage::Record to ApplicationRecord so they share a single pool.
63 lines
2.1 KiB
Ruby
63 lines
2.1 KiB
Ruby
ActiveSupport.on_load(:active_storage_attachment) do
|
|
include Storage::AttachmentTracking
|
|
end
|
|
|
|
ActiveSupport.on_load(:active_storage_blob) do
|
|
ActiveStorage::DiskController.after_action only: :show do
|
|
expires_in 5.minutes, public: true
|
|
end
|
|
end
|
|
|
|
ActiveSupport.on_load(:action_text_content) do
|
|
# Install our extensions after ActionText::Engine's
|
|
ActiveSupport.on_load(:active_storage_blob) do
|
|
# Ensure all <action-text-attachment>s have a "url" attribute that's a relative
|
|
# path (for portability across host name changes, beta environments, etc).
|
|
def to_rich_text_attributes(*)
|
|
super.merge url: Rails.application.routes.url_helpers.polymorphic_url(self, only_path: true)
|
|
end
|
|
end
|
|
end
|
|
|
|
# ApplicationRecord calls `configure_replica_connections` to set up connection pools for the
|
|
# application models. We want ActiveStorage::Record to use the same pools for transactional
|
|
# integrity, proper callback invocation, joins, etc., however ActiveStorage::Record inherits from
|
|
# ActiveRecord::Base, not ApplicationRecord. This is how we make Active Storage always use the
|
|
# ApplicationRecord connection pool.
|
|
ActiveSupport.on_load(:active_storage_record) do
|
|
class << self
|
|
delegate :connection_pool, to: "ApplicationRecord"
|
|
end
|
|
end
|
|
|
|
module ActiveStorageControllerExtensions
|
|
extend ActiveSupport::Concern
|
|
|
|
included do
|
|
before_action do
|
|
# Add script_name so that Disk Service will generate correct URLs for uploads
|
|
ActiveStorage::Current.url_options = {
|
|
protocol: request.protocol,
|
|
host: request.host,
|
|
port: request.port,
|
|
script_name: request.script_name
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
module ActiveStorageDirectUploadsControllerExtensions
|
|
extend ActiveSupport::Concern
|
|
|
|
included do
|
|
include Authentication
|
|
include Authorization
|
|
skip_forgery_protection if: :authenticate_by_bearer_token
|
|
end
|
|
end
|
|
|
|
Rails.application.config.to_prepare do
|
|
ActiveStorage::BaseController.include ActiveStorageControllerExtensions
|
|
ActiveStorage::DirectUploadsController.include ActiveStorageDirectUploadsControllerExtensions
|
|
end
|