jmcnevin-delayed_job 2.0.5 → 2.0.6

data/Rakefile

@@ -1,36 +1,4 @@
 # -*- encoding: utf-8 -*-
-begin
-  require 'jeweler'
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-  exit 1
-end
-
-Jeweler::Tasks.new do |s|
-  s.name     = "delayed_job"
-  s.summary  = "Database-backed asynchronous priority queue system -- Extracted from Shopify"
-  s.email    = "tobi@leetsoft.com"
-  s.homepage = "http://github.com/collectiveidea/delayed_job"
-  s.description = "Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.\n\nThis gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)."
-  s.authors  = ["Brandon Keepers", "Tobias Lütke"]
-  
-  s.has_rdoc = true
-  s.rdoc_options = ["--main", "README.textile", "--inline-source", "--line-numbers"]
-  s.extra_rdoc_files = ["README.textile"]
-  
-  s.test_files = Dir['spec/*_spec.rb']
-  
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "sqlite3-ruby"
-  s.add_development_dependency "mongo_mapper"
-  s.add_development_dependency "dm-core"
-  s.add_development_dependency "dm-observer"
-  s.add_development_dependency "dm-aggregates"
-  s.add_development_dependency "dm-validations"
-  s.add_development_dependency "do_sqlite3"
-  s.add_development_dependency "database_cleaner"
-end
-
 require 'spec/rake/spectask'
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.6

data/delayed_job.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jmcnevin-delayed_job}
-  s.version = "2.0.5"
+  s.version = "2.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Tobias L\303\274tke", "Jeremy McNevin"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2010-08-27}
   s.description = %q{Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.
 
 This gem is jmcnevin's fork (http://github.com/jmcnevin/delayed_job).}
@@ -21,8 +21,6 @@ This gem is jmcnevin's fork (http://github.com/jmcnevin/delayed_job).}
      "Rakefile",
      "VERSION",
      "benchmarks.rb",
-     "contrib/delayed_job.monitrc",
-     "contrib/delayed_job_multiple.monitrc",
      "delayed_job.gemspec",
      "generators/delayed_job/delayed_job_generator.rb",
      "generators/delayed_job/templates/migration.rb",
@@ -34,7 +32,6 @@ This gem is jmcnevin's fork (http://github.com/jmcnevin/delayed_job).}
      "lib/delayed/message_sending.rb",
      "lib/delayed/performable_method.rb",
      "lib/delayed/railtie.rb",
-     "lib/delayed/recipes.rb",
      "lib/delayed/tasks.rb",
      "lib/delayed/worker.rb",
      "lib/delayed_job.rb",

data/lib/delayed/worker.rb

@@ -10,20 +10,17 @@ module Delayed
                    :default_priority,
                    :sleep_delay,
                    :logger,
-                   :trap_signals,
                    :destroy_failed_jobs
+    cattr_reader   :backend
 
-    cattr_reader :backend
-
-    # name_prefix is ignored if name is set directly
-    attr_accessor :name_prefix
+    attr_accessor  :name_prefix # name_prefix is ignored if name is set directly
+    attr_writer    :name
 
     # default worker settings
     self.sleep_delay         = 5
     self.max_attempts        = 25
     self.max_run_time        = 4.hours
     self.default_priority    = 0
-    self.trap_signals        = true
     self.destroy_failed_jobs = true
 
     self.logger = if defined?(Merb::Logger)
@@ -68,23 +65,16 @@ module Delayed
     # safely resume working on tasks which are locked by themselves. The worker will assume that
     # it crashed before.
     def name
-      return @name unless @name.nil?
-      "#{@name_prefix}host:#{Socket.gethostname} pid:#{Process.pid}" rescue "#{@name_prefix}pid:#{Process.pid}"
-    end
-
-    # Sets the name of the worker.
-    # Setting the name to nil will reset the default worker name
-    def name=(val)
-      @name = val
+      @name || "#{@name_prefix}host:#{Socket.gethostname} pid:#{Process.pid}"
+    rescue
+      "#{@name_prefix}pid:#{Process.pid}"
     end
 
     def start
       say "*** Starting job worker #{name}"
 
-      if self.trap_signals
-        trap('TERM') { say 'Exiting...'; $exit = true }
-        trap('INT')  { say 'Exiting...'; $exit = true }
-      end
+      trap('TERM') { say 'Exiting...'; $exit = true }
+      trap('INT')  { say 'Exiting...'; $exit = true }
 
       loop do
         result = nil
@@ -138,8 +128,7 @@ module Delayed
       # TODO: warn if runtime > max_run_time ?
       say "* [JOB] #{name} completed after %.4f" % runtime
       return true # did work
-    # rescue Exception => e # rescuing Exception can have some strange downsides in my experience
-    rescue => e
+    rescue Exception => e
       handle_failed_job(job, e)
       return false # work failed
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jmcnevin-delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -07:00
+date: 2010-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,8 +164,6 @@ files:
 - Rakefile
 - VERSION
 - benchmarks.rb
-- contrib/delayed_job.monitrc
-- contrib/delayed_job_multiple.monitrc
 - delayed_job.gemspec
 - generators/delayed_job/delayed_job_generator.rb
 - generators/delayed_job/templates/migration.rb
@@ -177,7 +175,6 @@ files:
 - lib/delayed/message_sending.rb
 - lib/delayed/performable_method.rb
 - lib/delayed/railtie.rb
-- lib/delayed/recipes.rb
 - lib/delayed/tasks.rb
 - lib/delayed/worker.rb
 - lib/delayed_job.rb

data/contrib/delayed_job.monitrc

@@ -1,14 +0,0 @@
-# an example Monit configuration file for delayed_job
-# See: http://stackoverflow.com/questions/1226302/how-to-monitor-delayedjob-with-monit/1285611
-#
-# To use:
-# 1. copy to /var/www/apps/{app_name}/shared/delayed_job.monitrc
-# 2. replace {app_name} as appropriate
-# 3. add this to your /etc/monit/monitrc
-#
-#   include /var/www/apps/{app_name}/shared/delayed_job.monitrc
-
-check process delayed_job
-  with pidfile /var/www/apps/{app_name}/shared/pids/delayed_job.pid
-  start program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job start"
-  stop program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job stop"

data/contrib/delayed_job_multiple.monitrc

@@ -1,23 +0,0 @@
-# an example Monit configuration file for delayed_job running multiple processes
-#
-# To use:
-# 1. copy to /var/www/apps/{app_name}/shared/delayed_job.monitrc
-# 2. replace {app_name} as appropriate
-# 3. add this to your /etc/monit/monitrc
-#
-#   include /var/www/apps/{app_name}/shared/delayed_job.monitrc
-
-check process delayed_job_0
-  with pidfile /var/www/apps/{app_name}/shared/pids/delayed_job.0.pid
-  start program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job start -i 0"
-  stop program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job stop -i 0"
-  
-check process delayed_job_1
-  with pidfile /var/www/apps/{app_name}/shared/pids/delayed_job.1.pid
-  start program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job start -i 1"
-  stop program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job stop -i 1"
-  
-check process delayed_job_2
-  with pidfile /var/www/apps/{app_name}/shared/pids/delayed_job.2.pid
-  start program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job start -i 2"
-  stop program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job stop -i 2"

data/lib/delayed/recipes.rb

@@ -1,31 +0,0 @@
-# Capistrano Recipes for managing delayed_job
-#
-# Add these callbacks to have the delayed_job process restart when the server
-# is restarted:
-#
-#   after "deploy:stop",    "delayed_job:stop"
-#   after "deploy:start",   "delayed_job:start"
-#   after "deploy:restart", "delayed_job:restart"
-
-Capistrano::Configuration.instance.load do
-  namespace :delayed_job do
-    def rails_env
-      fetch(:rails_env, false) ? "RAILS_ENV=#{fetch(:rails_env)}" : ''
-    end
-    
-    desc "Stop the delayed_job process"
-    task :stop, :roles => :app do
-      run "cd #{current_path};#{rails_env} script/delayed_job stop"
-    end
-
-    desc "Start the delayed_job process"
-    task :start, :roles => :app do
-      run "cd #{current_path};#{rails_env} script/delayed_job start"
-    end
-
-    desc "Restart the delayed_job process"
-    task :restart, :roles => :app do
-      run "cd #{current_path};#{rails_env} script/delayed_job restart"
-    end
-  end
-end