Refactoring: Make Scheduler more robust against job deletion while processing.

2018-12-03 12:27:51 +01:00 · 2018-12-03 12:27:51 +01:00 · b5a44ee0d0
commit b5a44ee0d0
parent 1be60c91db
1 changed files with 13 additions and 6 deletions
--- a/app/models/scheduler.rb
+++ b/app/models/scheduler.rb
@ -257,13 +257,20 @@ class Scheduler < ApplicationModel
      else
        _start_job(job)
      end
-      job.pid = ''
-      job.save
-      logger.info " ...stopped thread for '#{job.method}'"
-      ActiveRecord::Base.connection.close

-      # release thread lock and remove thread handle
-      @@jobs_started.delete(job.id)
+      if job.present?
+        job.pid = ''
+        job.save
+
+        logger.info " ...stopped thread for '#{job.method}'"
+
+        # release thread lock and remove thread handle
+        @@jobs_started.delete(job.id)
+      else
+        logger.warn ' ...Job got deleted while running'
+      end
+
+      ActiveRecord::Base.connection.close
    end
  end