Fix cancel

server/app/jobs/dj_jobs/run_simulate_data_point.rb

@@ -42,16 +42,17 @@ class RunSimulateDataPoint
     require 'json'
 
     def initialize(data_point_id, options = {})
-
-      @options = options
-
       @data_point = DataPoint.find(data_point_id)
-      @data_point.status = :queued
-      @data_point.run_queue_time = Time.now
+      @options = options
       @intialize_worker_errs = []
 
+      # this is also run from resque job, which leverages perform code below.
+      # only queue data_point on initialize for delayed_jobs
+      @data_point.set_queued_state if Rails.application.config.job_manager == :delayed_job
+
     end
 
+
     def perform
       # Create the analysis, simulation, and run directory
       FileUtils.mkdir_p analysis_dir unless Dir.exist? analysis_dir

server/app/jobs/resque_jobs/run_simulate_data_point.rb

@@ -39,6 +39,11 @@ module ResqueJobs
   class RunSimulateDataPoint
     @queue = :simulations
 
+    def self.after_enqueue(data_point_id, options = {})
+      d = DataPoint.find(data_point_id)
+      d.set_queued_state
+    end
+
     def self.perform(data_point_id, options = {})
       job = DjJobs::RunSimulateDataPoint.new(data_point_id, options)
       job.perform

server/app/models/analysis.rb

@@ -157,7 +157,6 @@ def stop_analysis
     logger.info('attempting to stop analysis')
 
     self.run_flag = false
-    # The ensure block will clean up the jobs and save the statuses
 
     jobs.each do |j|
       unless j.status == 'completed'

server/app/models/data_point.rb

@@ -137,14 +137,20 @@ def set_complete_state
   end
 
   def set_canceled_state
-    self.destroy_background_job # Remove the datapoint from the delayed jobs queue
+    self.destroy_background_job # destroy queued job
     self.run_start_time ||= Time.now
     self.run_end_time = Time.now
     self.status = :completed
     self.status_message = 'datapoint canceled'
     save!
   end
 
+  def set_queued_state
+    self.status = :queued
+    self.run_queue_time = Time.now
+    save!
+  end
+
   protected
 
   def verify_uuid
@@ -160,7 +166,7 @@ def destroy_background_job
       end
     elsif Rails.application.config.job_manager == :resque
       if job_id
-        Resque::Job.destroy(:simulations, 'ResqueJobs::RunSimulateDataPointResque', job_id)
+        Resque::Job.destroy(:simulations, 'ResqueJobs::RunSimulateDataPoint', job_id)
       end
     else
       raise 'Rails.application.config.job_manager must be set to :resque or :delayed_job'