diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-12-01 08:35:12 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-12-01 08:35:12 +0100 |
| commit | 208911e4c007b2dc1c1a9d6175abaf95522d00b4 (patch) | |
| tree | 3caaa37bbcd730eeb1c1a239623a18b10dbfea21 | |
| parent | fa5426d1883ad925a2e8172631b93c845eb80d00 (diff) | |
| parent | b83c097a3c6b01870e58c4da01702c2e4996ca0e (diff) | |
| download | rails-208911e4c007b2dc1c1a9d6175abaf95522d00b4.tar.gz rails-208911e4c007b2dc1c1a9d6175abaf95522d00b4.tar.bz2 rails-208911e4c007b2dc1c1a9d6175abaf95522d00b4.zip | |
Merge pull request #22449 from dnagir/database_connection_message
Explain the connection pool error message better [ci skip]
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 2 |
1 files changed, 1 insertions, 1 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 486b7b6d25..ccd2899489 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -197,7 +197,7 @@ module ActiveRecord elapsed = Time.now - t0 if elapsed >= timeout - msg = 'could not obtain a database connection within %0.3f seconds (waited %0.3f seconds)' % + msg = 'could not obtain a connection from the pool within %0.3f seconds (waited %0.3f seconds); all pooled connections were in use' % [timeout, elapsed] raise ConnectionTimeoutError, msg end |