don't use connection_pool with sidekiq #446

app/jobs/agent_job.rb

@@ -22,30 +22,8 @@ class AgentJob < ActiveJob::Base
   end
 
   def perform(agent, options={})
-    ActiveRecord::Base.connection_pool.with_connection do
-      if options[:ids].present?
-        Array(options[:ids]).each do |id|
-          # check for failed queries and rate-limiting
-          agent.work_after_check
-          fail AgentInactiveError, "#{agent.title} is not in working state" unless agent.working?
-
-          # observe rate-limiting settings, put back in queue if wait time is more than 5 sec
-          wait_time = agent.wait_time
-          fail TooManyRequestsError, "Wait time too long (#{wait_time.to_i} sec) for #{agent.title}" if wait_time > 5
-
-          sleep wait_time
-
-          work = Work.where(id: id).first
-          fail ActiveRecord::RecordNotFound if work.nil?
-
-          # store API response result and duration in api_responses table
-          response = { work_id: id, agent_id: agent.id }
-          ActiveSupport::Notifications.instrument("api_response.get") do |payload|
-            response.merge!(agent.collect_data(options.merge(work_id: id)))
-            payload.merge!(response)
-          end
-        end
-      else
+    if options[:ids].present?
+      Array(options[:ids]).each do |id|
         # check for failed queries and rate-limiting
         agent.work_after_check
         fail AgentInactiveError, "#{agent.title} is not in working state" unless agent.working?
@@ -56,20 +34,38 @@ def perform(agent, options={})
 
         sleep wait_time
 
+        work = Work.where(id: id).first
+        fail ActiveRecord::RecordNotFound if work.nil?
+
         # store API response result and duration in api_responses table
-        response = { agent_id: agent.id }
+        response = { work_id: id, agent_id: agent.id }
         ActiveSupport::Notifications.instrument("api_response.get") do |payload|
-          response.merge!(agent.collect_data(options))
+          response.merge!(agent.collect_data(options.merge(work_id: id)))
           payload.merge!(response)
         end
       end
+    else
+      # check for failed queries and rate-limiting
+      agent.work_after_check
+      fail AgentInactiveError, "#{agent.title} is not in working state" unless agent.working?
+
+      # observe rate-limiting settings, put back in queue if wait time is more than 5 sec
+      wait_time = agent.wait_time
+      fail TooManyRequestsError, "Wait time too long (#{wait_time.to_i} sec) for #{agent.title}" if wait_time > 5
+
+      sleep wait_time
+
+      # store API response result and duration in api_responses table
+      response = { agent_id: agent.id }
+      ActiveSupport::Notifications.instrument("api_response.get") do |payload|
+        response.merge!(agent.collect_data(options))
+        payload.merge!(response)
+      end
     end
   end
 
   after_perform do |job|
-    ActiveRecord::Base.connection_pool.with_connection do
-      agent, _options = job.arguments
-      agent.wait_after_check
-    end
+    agent, _options = job.arguments
+    agent.wait_after_check
   end
 end

app/jobs/api_snapshot_job.rb

@@ -2,23 +2,21 @@ class ApiSnapshotJob < ActiveJob::Base
   queue_as :high
 
   def perform(options={})
-    ActiveRecord::Base.connection_pool.with_connection do
-      id = options[:id] || raise(ArgumentError, "Must supply :id")
-      upload_on_finished = options[:upload_on_finished]
+    id = options[:id] || raise(ArgumentError, "Must supply :id")
+    upload_on_finished = options[:upload_on_finished]
 
-      api_snapshot = ApiSnapshot.find_by_id!(options[:id])
-      api_snapshot.snapshot!
+    api_snapshot = ApiSnapshot.find_by_id!(options[:id])
+    api_snapshot.snapshot!
 
-      if !api_snapshot.finished?
-        api_snapshot.update_attributes!(
-          start_page: api_snapshot.pageno + 1,
-          mode: ApiSnapshot::APPEND_MODE
-        )
-        ApiSnapshotJob.perform_later(id: api_snapshot.id)
-      elsif upload_on_finished
-        ApiSnapshotUtility.zip(api_snapshot)
-        ApiSnapshotUtility.export_to_zenodo(api_snapshot)
-      end
+    if !api_snapshot.finished?
+      api_snapshot.update_attributes!(
+        start_page: api_snapshot.pageno + 1,
+        mode: ApiSnapshot::APPEND_MODE
+      )
+      ApiSnapshotJob.perform_later(id: api_snapshot.id)
+    elsif upload_on_finished
+      ApiSnapshotUtility.zip(api_snapshot)
+      ApiSnapshotUtility.export_to_zenodo(api_snapshot)
     end
   rescue Exception => ex
     Notification.create(exception: ex, details: options.inspect)

app/jobs/cache_job.rb

@@ -6,17 +6,13 @@ class CacheJob < ActiveJob::Base
 
   end
 
-  # rescue_from StandardError do |exception|
-  #   ActiveRecord::Base.connection_pool.with_connection do
-  #     Notification.where(message: exception.message).where(unresolved: true).first_or_create(
-  #                        exception: exception,
-  #                        class_name: exception.class.to_s)
-  #   end
-  # end
+  rescue_from StandardError do |exception|
+    Notification.where(message: exception.message).where(unresolved: true).first_or_create(
+                       exception: exception,
+                       class_name: exception.class.to_s)
+  end
 
   def perform(resource)
-    ActiveRecord::Base.connection_pool.with_connection do
-      resource.write_cache
-    end
+    resource.write_cache
   end
 end

app/jobs/data_export_job.rb

@@ -2,10 +2,8 @@ class DataExportJob < ActiveJob::Base
   queue_as :high
 
   def perform(options={})
-    ActiveRecord::Base.connection_pool.with_connection do
-      data_export = DataExport.find_by_id!(options[:id])
-      data_export.export!
-    end
+    data_export = DataExport.find_by_id!(options[:id])
+    data_export.export!
   rescue Exception => ex
     Notification.create(exception: ex)
   end

app/jobs/delete_canonical_url_job.rb

@@ -2,9 +2,7 @@ class DeleteCanonicalUrlJob < ActiveJob::Base
   queue_as :high
 
   def perform(source)
-    ActiveRecord::Base.connection_pool.with_connection do
-      # reset all canonical urls
-      Work.update_all(canonical_url: nil)
-    end
+    # reset all canonical urls
+    Work.update_all(canonical_url: nil)
   end
 end

app/jobs/delete_work_job.rb

@@ -2,11 +2,9 @@ class DeleteWorkJob < ActiveJob::Base
   queue_as :high
 
   def perform(options = {})
-    ActiveRecord::Base.connection_pool.with_connection do
-      collection = Work
-      collection = collection.where(publisher_id: options[:publisher_id]) unless options[:publisher_id] == "all"
-      collection = collection.where(source_id: options[:source_id]) unless options[:source_id] == "all"
-      collection.destroy_all
-    end
+    collection = Work
+    collection = collection.where(publisher_id: options[:publisher_id]) unless options[:publisher_id] == "all"
+    collection = collection.where(source_id: options[:source_id]) unless options[:source_id] == "all"
+    collection.destroy_all
   end
 end

app/jobs/deposit_job.rb

@@ -16,8 +16,6 @@ class DepositJob < ActiveJob::Base
   end
 
   def perform(deposit)
-    ActiveRecord::Base.connection_pool.with_connection do
-      deposit.process_data
-    end
+    deposit.process_data
   end
 end

app/jobs/deposit_reprocess_job.rb

@@ -13,8 +13,6 @@ class DepositReprocessJob < ActiveJob::Base
   end
 
   def perform(ids)
-    ActiveRecord::Base.connection_pool.with_connection do
-      Deposit.where(id: ids).find_each { |deposit| deposit.reset }
-    end
+    Deposit.where(id: ids).find_each { |deposit| deposit.reset }
   end
 end

app/jobs/relation_job.rb

@@ -7,16 +7,12 @@ class RelationJob < ActiveJob::Base
   end
 
   rescue_from StandardError do |exception|
-    ActiveRecord::Base.connection_pool.with_connection do
-      Notification.where(message: exception.message).where(unresolved: true).first_or_create(
-                         exception: exception,
-                         class_name: exception.class.to_s)
-    end
+    Notification.where(message: exception.message).where(unresolved: true).first_or_create(
+                       exception: exception,
+                       class_name: exception.class.to_s)
   end
 
   def perform
-    ActiveRecord::Base.connection_pool.with_connection do
-      Relation.set_month_id
-    end
+    Relation.set_month_id
   end
 end

app/jobs/status_cache_job.rb

@@ -7,16 +7,12 @@ class StatusCacheJob < ActiveJob::Base
   end
 
   rescue_from StandardError do |exception|
-    ActiveRecord::Base.connection_pool.with_connection do
-      Notification.where(message: exception.message).where(unresolved: true).first_or_create(
-                         exception: exception,
-                         class_name: exception.class.to_s)
-    end
+    Notification.where(message: exception.message).where(unresolved: true).first_or_create(
+                       exception: exception,
+                       class_name: exception.class.to_s)
   end
 
   def perform
-    ActiveRecord::Base.connection_pool.with_connection do
-      Status.create
-    end
+    Status.create
   end
 end