diff options
| author | David Heinemeier Hansson <david@envy8-2.local> | 2008-04-29 16:43:47 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@envy8-2.local> | 2008-04-29 16:43:47 -0500 |
| commit | 5514baf63d6d5e19a84c59a0c2cf74f442daed9c (patch) | |
| tree | ecde263c340d9fdbcf0f3ba9d9276e38f7fbfb96 /activerecord | |
| parent | 0780563ae7b2df74613550f1438d13459cb10b1f (diff) | |
| parent | 5be53058775a1482c1e5655dcb0ca4430cf0dbe1 (diff) | |
| download | rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.tar.gz rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.tar.bz2 rails-5514baf63d6d5e19a84c59a0c2cf74f442daed9c.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 300688453a..63306644fb 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -423,7 +423,9 @@ module ActiveRecord #:nodoc: @@default_timezone = :local # Determines whether to use a connection for each thread, or a single shared connection for all threads. - # Defaults to false. Set to true if you're writing a threaded application. + # Defaults to false. If you're writing a threaded application, set to true + # and periodically call verify_active_connections! to clear out connections + # assigned to stale threads. cattr_accessor :allow_concurrency, :instance_writer => false @@allow_concurrency = false |