say_when 0.2.6 → 0.3.0

data/.gitignore

@@ -3,4 +3,5 @@
 Gemfile.lock
 pkg/*
 *.DS_Store
-.rvmrc
+spec/db/test.db
+.ruby-version

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.8.7
+script: bundle exec spec spec/

data/lib/say_when/scheduler.rb

@@ -7,8 +7,8 @@ module SayWhen
 
     @@scheduler = nil
     @@lock = nil
-    
-    attr_accessor :storage_strategy, :processor_class, :tick_length
+
+    attr_accessor :storage_strategy, :processor_class, :tick_length, :reset_acquired_length
 
     attr_accessor :running
 
@@ -40,11 +40,11 @@ module SayWhen
       def start
         self.scheduler.start
       end
-
     end
 
     def initialize
       self.tick_length = 1
+      self.reset_acquired_length = 3600
     end
 
     def processor
@@ -54,7 +54,7 @@ module SayWhen
       end
       @processor
     end
-    
+
     def start
       logger.info "SayWhen::Scheduler starting"
 
@@ -68,42 +68,69 @@ module SayWhen
 
         logger.info "SayWhen::Scheduler running"
         job = nil
+        reset_next_at = Time.now
         while running
           begin
             time_now = Time.now
-            logger.debug "SayWhen:: Looking for job that should be ready to fire before #{time_now}"
-            job = job_class.acquire_next(time_now)
+
+            if reset_acquired_length > 0 && reset_next_at <= time_now
+              reset_next_at = time_now + reset_acquired_length
+              logger.debug "SayWhen:: reset acquired at #{time_now}, try again at #{reset_next_at}"
+              job_class.reset_acquired(reset_acquired_length)
+            end
+
+            begin
+              logger.debug "SayWhen:: Looking for job that should be ready to fire before #{time_now}"
+              job = job_class.acquire_next(time_now)
+            rescue StandardError => ex
+              job_error("Failure to acquire job", job, ex)
+              job = nil
+            end
+
             if job.nil?
               logger.debug "SayWhen:: no jobs to acquire, sleep"
               sleep(tick_length)
-            else
+              next
+            end
+
+            begin
               logger.debug "SayWhen:: got a job: #{job.inspect}"
               # delegate processing the trigger to the processor
               self.processor.process(job)
               logger.debug "SayWhen:: job processed"
 
-              # this should update next fire at, and put back in list of scheduled jobs
+              # if successful, update next fire at, put back to waiting / ended
               job.fired(time_now)
               logger.debug "SayWhen:: job fired complete"
+            rescue StandardError=>ex
+              job_error("Failure to process", job, ex)
             end
-          rescue Interrupt
-            job_msg = job && " job:'#{job.inspect}'"
-            logger.error "\nSayWhen:: Interrupt! #{job_msg}"
-            exit
-          rescue StandardError=>ex
-            job_msg = job && " job:'#{job.inspect}'"
-            logger.error "SayWhen:: Failure to process#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
-            job.release if job
-          rescue Exception=>ex
-            logger.error "SayWhen:: Exception in process#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
-            exit
+
+          rescue Interrupt => ex
+            job_error("Interrupt!", job, ex)
+            raise ex
+          rescue StandardError => ex
+            job_error("Error!", job, ex)
+            sleep(tick_length)
+          rescue Exception => ex
+            job_error("Exception!", job, ex)
+            raise ex
           end
         end
+      rescue Exception=>ex
+        logger.error "SayWhen::Scheduler stopping, error: #{ex.class.name}: #{ex.message}"
+        exit
       end
 
       logger.info "SayWhen::Scheduler stopped"
     end
 
+    def job_error(msg, job, ex)
+      job_msg = job && " job:'#{job.inspect}'"
+      logger.error "SayWhen::Scheduler #{msg}#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
+      job.release if job
+    end
+
     def stop
       logger.info "SayWhen::Scheduler stopping..."
       self.running = false

data/lib/say_when/storage/active_record/job.rb

@@ -8,18 +8,23 @@ module SayWhen
     module ActiveRecord
 
       class Job  < ::ActiveRecord::Base
-
         include SayWhen::BaseJob
-
         self.table_name = "say_when_jobs"
-
-
         serialize :trigger_options
         serialize :data
         belongs_to :scheduled, :polymorphic => true
         has_many  :job_executions, :class_name=>'SayWhen::Storage::ActiveRecord::JobExecution'
         before_create :set_defaults
 
+        def self.reset_acquired(older_than_seconds)
+          return unless older_than_seconds.to_i > 0
+          older_than = (Time.now - older_than_seconds.to_i)
+          update_all(
+            "status = '#{STATE_WAITING}'",
+            ["status = ? and updated_at < ?", STATE_ACQUIRED, older_than]
+          )
+        end
+
         def self.acquire_next(no_later_than)
           @next_job = nil
           hide_logging do
@@ -28,13 +33,13 @@ module SayWhen
               @next_job = find(:first,
                               :lock       => true,
                               :order      => 'next_fire_at ASC',
-                              :conditions => ['status = ? and ? >= next_fire_at', 
+                              :conditions => ['status = ? and ? >= next_fire_at',
                                               STATE_WAITING,
                                               no_later_than.in_time_zone('UTC')])
 
               # set status to acquired to take it out of rotation
               @next_job.update_attribute(:status, STATE_ACQUIRED) unless @next_job.nil?
-        
+
             end
           end
           @next_job
@@ -94,9 +99,9 @@ module SayWhen
             ::ActiveRecord::Base.logger = old_logger
           end
         end
-        
+
       end
-    
+
     end
   end
 end

data/lib/say_when/storage/memory/job.rb

@@ -17,21 +17,45 @@ module SayWhen
         has_properties :trigger_strategy, :trigger_options, :last_fire_at, :next_fire_at
         has_properties :job_class, :job_method, :data
         has_properties :scheduled
+        has_properties :updated_at
+
+        def self.class_lock
+          @@_lock ||= Mutex.new
+        end
+
+        def self._reset
+          @@jobs = SortedSet.new
+        end
+
+        def self.reset_acquired(older_than_seconds)
+          return unless older_than_seconds.to_i > 0
+          older_than = (Time.now - older_than_seconds.to_i)
+          self.class_lock.synchronize {
+            jobs.select do |j|
+              j.status == STATE_ACQUIRED && j.updated_at < older_than
+            end.each{ |j| j.status = STATE_WAITING }
+          }
+        end
 
         def self.acquire_next(no_later_than)
-          self.lock.synchronize {
-            
+          self.class_lock.synchronize {
+
             next_job = jobs.detect(nil) do |j|
               (j.status == STATE_WAITING) && (j.next_fire_at.to_i <= no_later_than.to_i)
             end
 
-            next_job.status = STATE_ACQUIRED if next_job
+            if next_job
+              next_job.status = STATE_ACQUIRED
+              next_job.updated_at = Time.now
+            end
+
             next_job
-          }          
+          }
         end
 
         def initialize(options={})
           super
+          self.updated_at = Time.now
           self.status = STATE_WAITING unless self.status
           self.next_fire_at = trigger.next_fire_at
           self.class.jobs << self
@@ -41,6 +65,15 @@ module SayWhen
           self.next_fire_at.to_i <=> job.next_fire_at.to_i
         end
 
+        def fired(fired_at=Time.now)
+          super
+          self.updated_at = Time.now
+        end
+
+        def release
+          super
+          self.updated_at = Time.now
+        end
       end
 
     end

data/lib/say_when/tasks.rb

@@ -6,17 +6,4 @@ namespace :say_when do
     SayWhen::Scheduler.start
   end
 
-  # # Preload app files if this is Rails
-  # # thanks resque
-  # task :preload => :setup do
-  #   if defined?(Rails) && Rails.respond_to?(:application)
-  #     # Rails 3
-  #     Rails.application.eager_load!
-  #   elsif defined?(Rails::Initializer)
-  #     # Rails 2.3
-  #     $rails_rake_task = false
-  #     Rails::Initializer.run :load_application_classes
-  #   end
-  # end
-
-end
+end

data/lib/say_when/version.rb

@@ -1,3 +1,3 @@
 module SayWhen
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

data/say_when.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "activemessaging", '~> 0.9.0'
   s.add_development_dependency "activesupport", '~> 2.3.14'
   s.add_development_dependency "activerecord", '~> 2.3.14'
-  s.add_development_dependency "mongoid", '~> 1.9.5'
   s.add_development_dependency 'rspec', "~> 1.3"
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 0.8.7'
 
 end

data/spec/say_when/storage/active_record/job_spec.rb

@@ -5,6 +5,8 @@ require File.dirname(__FILE__) + '/../../../../lib/say_when/storage/active_recor
 describe SayWhen::Storage::ActiveRecord::Job do
 
   before(:each) do
+    SayWhen::Storage::ActiveRecord::Job.delete_all
+
     @valid_attributes = {
       :trigger_strategy => :cron,
       :trigger_options  => {:expression => '0 0 12 ? * * *', :time_zone  => 'Pacific Time (US & Canada)'},
@@ -48,6 +50,18 @@ describe SayWhen::Storage::ActiveRecord::Job do
     j.next_fire_at.should == ce.next_fire_at
   end
 
+  it "resets acquired jobs" do
+    old = 2.hours.ago
+    j = SayWhen::Storage::ActiveRecord::Job.create!(@valid_attributes.merge({
+      :status => 'acquired', :updated_at => old, :created_at => old
+    }))
+
+    SayWhen::Storage::ActiveRecord::Job.reset_acquired(3600)
+
+    j.reload
+    j.status.should == 'waiting'
+  end
+
   it "can find the next job" do
     j2_opts = {
       :trigger_strategy => :cron,

data/spec/say_when/storage/memory/job_spec.rb

@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/../../../../lib/say_when/storage/memory/job'
 describe SayWhen::Store::Memory::Job do
 
   before(:each) do
+    SayWhen::Store::Memory::Job._reset
     @valid_attributes = {
       :name       => 'Memory::Job::Test',
       :group      => 'Test',
@@ -28,4 +29,17 @@ describe SayWhen::Store::Memory::Job do
     j.execute.should == 1
   end
 
+  it "can reset acquired jobs" do
+    j = SayWhen::Store::Memory::Job.new(@valid_attributes)
+    j.status = 'acquired'
+    j.updated_at = 2.hours.ago
+    SayWhen::Store::Memory::Job.reset_acquired(3600)
+    j.status.should == 'waiting'
+  end
+
+  it "can find the next job" do
+    j = SayWhen::Store::Memory::Job.new(@valid_attributes)
+    next_job = SayWhen::Store::Memory::Job.acquire_next(1.day.since)
+    next_job.should == j
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: say_when
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andrew Kuklewicz
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-30 00:00:00 Z
+date: 2016-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activemessaging
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +30,11 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
-  type: :development
-  prerelease: false
   requirement: *id001
+  name: activemessaging
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +46,11 @@ dependencies:
         - 3
         - 14
         version: 2.3.14
-  type: :development
-  prerelease: false
   requirement: *id002
+  name: activesupport
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,28 +62,12 @@ dependencies:
         - 3
         - 14
         version: 2.3.14
-  type: :development
-  prerelease: false
   requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 1
-        - 9
-        - 5
-        version: 1.9.5
+  name: activerecord
   type: :development
-  prerelease: false
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +77,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
+  requirement: *id004
+  name: rspec
   type: :development
-  prerelease: false
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,23 +91,25 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+  name: sqlite3
   type: :development
-  prerelease: false
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 7
+        version: 0.8.7
+  requirement: *id006
+  name: rake
   type: :development
-  prerelease: false
-  requirement: *id007
 description: 
 email: 
 - andrew@prx.org
@@ -135,6 +121,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - Rakefile
 - generators/say_when_migration/say_when_migration_generator.rb
@@ -154,7 +141,6 @@ files:
 - lib/say_when/storage/active_record/job_execution.rb
 - lib/say_when/storage/memory/base.rb
 - lib/say_when/storage/memory/job.rb
-- lib/say_when/storage/mongoid/job.rb
 - lib/say_when/tasks.rb
 - lib/say_when/triggers/base.rb
 - lib/say_when/triggers/cron_strategy.rb
@@ -165,15 +151,12 @@ files:
 - say_when.gemspec
 - spec/active_record_spec_helper.rb
 - spec/db/schema.rb
-- spec/db/test.db
-- spec/mongoid_spec_helper.rb
 - spec/say_when/cron_expression_spec.rb
 - spec/say_when/processor/active_messaging_spec.rb
 - spec/say_when/scheduler_spec.rb
 - spec/say_when/storage/active_record/job_spec.rb
 - spec/say_when/storage/memory/job_spec.rb
 - spec/say_when/storage/memory/trigger_spec.rb
-- spec/say_when/storage/mongoid/trigger_spec.rb
 - spec/say_when/triggers/once_strategy_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -207,22 +190,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Scheduling system for programmatically defined and stored jobs.
 test_files: 
 - spec/active_record_spec_helper.rb
 - spec/db/schema.rb
-- spec/db/test.db
-- spec/mongoid_spec_helper.rb
 - spec/say_when/cron_expression_spec.rb
 - spec/say_when/processor/active_messaging_spec.rb
 - spec/say_when/scheduler_spec.rb
 - spec/say_when/storage/active_record/job_spec.rb
 - spec/say_when/storage/memory/job_spec.rb
 - spec/say_when/storage/memory/trigger_spec.rb
-- spec/say_when/storage/mongoid/trigger_spec.rb
 - spec/say_when/triggers/once_strategy_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/say_when/storage/mongoid/job.rb

@@ -1,15 +0,0 @@
-require 'mongoid'
-
-module SayWhen
-  module Store
-    module Mongoid
-
-      class Job
-
-        include Mongoid::Document
-
-      end
-
-    end
-  end
-end

data/spec/mongoid_spec_helper.rb

@@ -1,7 +0,0 @@
-require 'mongoid'
-
-Mongoid.configure do |config|
-  config.master = Mongo::Connection.new.db("say_when_test")
-end
-
-# Mongoid.logger = Logger.new($stdout)

data/spec/say_when/storage/mongoid/trigger_spec.rb

@@ -1,57 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../mongoid_spec_helper'
-# require File.dirname(__FILE__) + '/../../../../lib/say_when/store/mongoid/trigger'
-
-# describe SayWhen::Store::Mongoid::Trigger do
-
-#   before(:each) do
-#     SayWhen::Store::Mongoid::Trigger.delete_all
-#     @valid_attributes = {
-#       :expression => '0 0 12 ? * * *',
-#       :time_zone  => 'Pacific Time (US & Canada)'
-#     }
-#   end
-
-#   it "can be created using new and save" do
-#     t = SayWhen::Store::Mongoid::Trigger.new(@valid_attributes)
-#     t.should be_valid
-#     t.save
-#   end
-
-#   it "sets a cron_expression" do
-#     t = SayWhen::Store::Mongoid::Trigger.create(@valid_attributes)
-#     t.cron_expression.should_not be_nil
-#     t.cron_expression.expression.should == '0 0 12 ? * * *'
-#     t.cron_expression.time_zone.should == 'Pacific Time (US & Canada)'
-#   end
-
-#   it "has a waiting state on create" do
-#     t = SayWhen::Store::Mongoid::Trigger.create(@valid_attributes)
-#     t.status.should == SayWhen::BaseTrigger::STATE_WAITING
-#   end
-
-#   it "has a next fire at set on create" do
-#     ce = SayWhen::CronExpression.new(@valid_attributes[:expression], @valid_attributes[:time_zone])
-#     t = SayWhen::Store::Mongoid::Trigger.create(@valid_attributes)
-#     t.status.should == SayWhen::BaseTrigger::STATE_WAITING
-#     t.next_fire_at.should == ce.next_fire_at(t.created_at)
-#   end
-
-#   it "can be fired" do
-#     ce = SayWhen::CronExpression.new(@valid_attributes[:expression], @valid_attributes[:time_zone])
-#     t = SayWhen::Store::Mongoid::Trigger.create(@valid_attributes)
-#     nfa = ce.last_fire_at(t.created_at - 1.second)
-#     lfa = ce.last_fire_at(nfa - 1.second)
-#     t.next_fire_at = nfa
-#     t.last_fire_at = lfa
-
-#     now = Time.now
-#     Time.stub!(:now).and_return(now)
-
-#     t.fired
-#     t.next_fire_at.should == ce.next_fire_at(now)
-#     t.last_fire_at.should == now
-#     t.status.should == SayWhen::BaseTrigger::STATE_WAITING
-#   end
-
-# end