aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-05-13 12:28:24 +0100
committerLouise Crow <louise.crow@gmail.com>2013-05-13 12:28:24 +0100
commit700920b7a7a2b8783f494392d6805e940ab18b80 (patch)
tree67ee0505e0a456e0fa0ba75f893bbedec5d8c177
parentc9d00f403ce61a9067f31ac840d9044ac8a0a344 (diff)
Revert "Workaround a Postgres connection error we are getting under Rails 3.1"
This reverts commit b03451b6253b0c0ecd202b48f7a702b7e6844a90.
-rw-r--r--vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb12
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)