diff options
author | Matthew Draper <matthew@trebex.net> | 2017-11-17 21:55:39 +1030 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2017-11-18 13:47:51 +1030 |
commit | f32cff5563f2188e657aa2fd9f8513f0da4a49ca (patch) | |
tree | a3ebdf2ba035c8c23e7a67d2e62b78669b471a4d /activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | |
parent | c39ed435eb578c79867552c66da7eeb035fa58ad (diff) | |
download | rails-f32cff5563f2188e657aa2fd9f8513f0da4a49ca.tar.gz rails-f32cff5563f2188e657aa2fd9f8513f0da4a49ca.tar.bz2 rails-f32cff5563f2188e657aa2fd9f8513f0da4a49ca.zip |
Improve AR connection fork safety
Use whatever adapter-provided means we have available to ensure forked
children don't send quit/shutdown/goodbye messages to the server on
connections that belonged to their parent.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 8de582fee1..1d614dc8bf 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -105,6 +105,11 @@ module ActiveRecord @connection.close end + def discard! # :nodoc: + @connection.automatic_close = false + @connection = nil + end + private def connect |