mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 01:16:38 -06:00
DEV: bind for thread local vars should yield block
followup on #015051ec without this improvement monkey patch does not work. bind should yield the block it is passed for it to work.
This commit is contained in:
parent
015051ecaf
commit
082f59842d
@ -4,47 +4,54 @@
|
||||
#
|
||||
# Without this patch each time we close a DB connection we spin a thread
|
||||
|
||||
class ::ActiveRecord::ConnectionAdapters::AbstractAdapter
|
||||
class StaticThreadLocalVar
|
||||
attr_reader :value
|
||||
module ::ActiveRecord
|
||||
module ConnectionAdapters
|
||||
class AbstractAdapter
|
||||
class StaticThreadLocalVar
|
||||
attr_reader :value
|
||||
|
||||
def initialize(value)
|
||||
@value = value
|
||||
end
|
||||
def initialize(value)
|
||||
@value = value
|
||||
end
|
||||
|
||||
def bind(value)
|
||||
raise "attempting to change immutable local var" if value != @value
|
||||
def bind(value)
|
||||
raise "attempting to change immutable local var" if value != @value
|
||||
if block_given?
|
||||
yield
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# we have no choice but to perform an aggressive patch here
|
||||
# if we simply hook the method we will still call a finalizer
|
||||
# on Concurrent::ThreadLocalVar
|
||||
|
||||
def initialize(connection, logger = nil, config = {}) # :nodoc:
|
||||
super()
|
||||
|
||||
@connection = connection
|
||||
@owner = nil
|
||||
@instrumenter = ActiveSupport::Notifications.instrumenter
|
||||
@logger = logger
|
||||
@config = config
|
||||
@pool = ActiveRecord::ConnectionAdapters::NullPool.new
|
||||
@idle_since = Concurrent.monotonic_time
|
||||
@visitor = arel_visitor
|
||||
@statements = build_statement_pool
|
||||
@lock = ActiveSupport::Concurrency::LoadInterlockAwareMonitor.new
|
||||
|
||||
if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
|
||||
@prepared_statement_status = Concurrent::ThreadLocalVar.new(true)
|
||||
@visitor.extend(DetermineIfPreparableVisitor)
|
||||
else
|
||||
#@prepared_statement_status = Concurrent::ThreadLocalVar.new(false)
|
||||
@prepared_statement_status = StaticThreadLocalVar.new(false)
|
||||
end
|
||||
|
||||
@advisory_locks_enabled = self.class.type_cast_config_to_boolean(
|
||||
config.fetch(:advisory_locks, true)
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# we have no choice but to perform an aggressive patch here
|
||||
# if we simply hook the method we will still call a finalizer
|
||||
# on Concurrent::ThreadLocalVar
|
||||
|
||||
def initialize(connection, logger = nil, config = {}) # :nodoc:
|
||||
super()
|
||||
|
||||
@connection = connection
|
||||
@owner = nil
|
||||
@instrumenter = ActiveSupport::Notifications.instrumenter
|
||||
@logger = logger
|
||||
@config = config
|
||||
@pool = ActiveRecord::ConnectionAdapters::NullPool.new
|
||||
@idle_since = Concurrent.monotonic_time
|
||||
@visitor = arel_visitor
|
||||
@statements = build_statement_pool
|
||||
@lock = ActiveSupport::Concurrency::LoadInterlockAwareMonitor.new
|
||||
|
||||
if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
|
||||
@prepared_statement_status = Concurrent::ThreadLocalVar.new(true)
|
||||
@visitor.extend(DetermineIfPreparableVisitor)
|
||||
else
|
||||
@prepared_statement_status = StaticThreadLocalVar.new(false)
|
||||
end
|
||||
|
||||
@advisory_locks_enabled = self.class.type_cast_config_to_boolean(
|
||||
config.fetch(:advisory_locks, true)
|
||||
)
|
||||
end
|
||||
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user