aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2014-10-28 16:17:33 -0700
committerXavier Noria <fxn@hashref.com>2014-10-28 16:35:24 -0700
commitb3bfa361c503e107aff4dee5edf79bd7fd3d3725 (patch)
tree4a9725f90708b45ff85e68b01335bbf94ee35f17 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
parent777142d3a7b9ea36fcc8562613749299ac6dc243 (diff)
downloadrails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.tar.gz
rails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.tar.bz2
rails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.zip
let's warn with heredocs
The current style for warning messages without newlines uses concatenation of string literals with manual trailing spaces where needed. Heredocs have better readability, and with `squish` we can still produce a single line. This is a similar use case to the one that motivated defining `strip_heredoc`, heredocs are super clean.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index eba51baba1..e197f7f2f9 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -2,6 +2,7 @@ require 'thread'
require 'thread_safe'
require 'monitor'
require 'set'
+require 'active_support/core_ext/string/filters'
module ActiveRecord
# Raised when a connection could not be obtained within the connection
@@ -518,10 +519,11 @@ module ActiveRecord
end
def connection_pools
- ActiveSupport::Deprecation.warn(
- "In the next release, this will return the same as #connection_pool_list. " \
- "(An array of pools, rather than a hash mapping specs to pools.)"
- )
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
+ In the next release, this will return the same as #connection_pool_list.
+ (An array of pools, rather than a hash mapping specs to pools.)
+ MSG
+
Hash[connection_pool_list.map { |pool| [pool.spec, pool] }]
end