diff options
| -rw-r--r-- | vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb index 62adbaea2..d45308fec 100644 --- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb +++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb @@ -717,16 +717,8 @@ module ActsAsXapian if not $?.success? raise "batch fork child failed, exiting also" end - - # FIXME: Under Rails 3.1 we get "SSL error: decryption failed or bad record mac", this works around it - retry_count = 0 - begin - # database connection doesn't survive a fork, rebuild it - ActiveRecord::Base.connection.reconnect! - rescue - retry_count += 1 - retry_count > 3 ? raise : retry - end + # database connection doesn't survive a fork, rebuild it + ActiveRecord::Base.connection.reconnect! else # fully reopen the database each time (with a new object) |