From 2bc67b88a41df7ed577facbf98c25e963a611fd3 Mon Sep 17 00:00:00 2001
From: Mikhail Nelaev <spyderdfx@gmail.com>
Date: Tue, 7 Jun 2016 12:34:15 +0500
Subject: [PATCH] fix: disconnect before forking

https://jira.railsc.ru/browse/SERVICES-1150
---
 lib/resque/integration/tasks/hooks.rake | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/resque/integration/tasks/hooks.rake b/lib/resque/integration/tasks/hooks.rake
index e4519b4..938d938 100644
--- a/lib/resque/integration/tasks/hooks.rake
+++ b/lib/resque/integration/tasks/hooks.rake
@@ -23,16 +23,14 @@ namespace :resque do
 
     Resque.before_fork do
       Resque.redis.client.disconnect
+
+      ActiveRecord::Base.connection_handler.clear_all_connections!
     end
 
     Resque.after_fork do |job|
       $0 = "resque-#{Resque::Version}: Processing #{job.queue}/#{job.payload['class']} since #{Time.now.to_s(:db)}"
 
-      if ActiveRecord::VERSION::MAJOR >= 4
-         ActiveRecord::Base.clear_active_connections!
-      else
-         ActiveRecord::Base.verify_active_connections!
-      end
+      ActiveRecord::Base.establish_connection
 
       Resque.redis.client.connect
     end