rabbit_jobs 0.1.8.2 → 0.1.9

data/lib/rabbit_jobs/configuration.rb

@@ -72,10 +72,9 @@ module RabbitJobs
       @data[name]
     end
 
-    def mail_errors_to(email = nil, from_email = nil)
-      if email && from_email
+    def mail_errors_to(email = nil)
+      if email
         @data[:mail_errors_to] = email
-        @data[:mail_errors_from] = from_email
       else
         @data[:mail_errors_to]
       end

data/lib/rabbit_jobs/scheduler.rb

@@ -122,6 +122,7 @@ module RabbitJobs
 
     def startup
       # prune_dead_workers
+      RabbitJobs::Util.check_pidfile(self.pidfile) if self.pidfile
 
       Process.daemon(true) if self.background
 

data/lib/rabbit_jobs/util.rb

@@ -0,0 +1,21 @@
+# -*- encoding : utf-8 -*-
+
+module RabbitJobs::Util
+  # clean old worker process
+  def self.check_pidfile(pidfile)
+    if File.exists?(pidfile)
+      pid = File.read(pidfile).to_i
+      begin
+        Process.kill(0, pid)
+        RJ.logger.info "Killing old rabbit_jobs process ##{pid}"
+        Process.kill("TERM", pid)
+
+        while Process.kill(0, pid)
+          sleep(0.5)
+        end
+      rescue
+        File.delete(pidfile) if File.exists?(pidfile)
+      end
+    end
+  end
+end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.8.2"
+  VERSION = "0.1.9"
 end

data/lib/rabbit_jobs/worker.rb

@@ -99,6 +99,7 @@ module RabbitJobs
 
     def startup
       # prune_dead_workers
+      RabbitJobs::Util.check_pidfile(self.pidfile) if self.pidfile
 
       if self.background
         child_pid = fork

data/lib/rabbit_jobs.rb

@@ -2,6 +2,7 @@
 
 require 'rabbit_jobs/version'
 
+require 'rabbit_jobs/util'
 require 'rabbit_jobs/helpers'
 require 'rabbit_jobs/amqp_helpers'
 require 'rabbit_jobs/configuration'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.8.2
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70350675513600 !ruby/object:Gem::Requirement
+  requirement: &70247572694120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70350675513600
+  version_requirements: *70247572694120
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70350675512820 !ruby/object:Gem::Requirement
+  requirement: &70247572693100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70350675512820
+  version_requirements: *70247572693100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70350675489860 !ruby/object:Gem::Requirement
+  requirement: &70247572691320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70350675489860
+  version_requirements: *70247572691320
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70350675488680 !ruby/object:Gem::Requirement
+  requirement: &70247572689800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70350675488680
+  version_requirements: *70247572689800
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -78,6 +78,7 @@ files:
 - lib/rabbit_jobs/publisher.rb
 - lib/rabbit_jobs/scheduler.rb
 - lib/rabbit_jobs/tasks.rb
+- lib/rabbit_jobs/util.rb
 - lib/rabbit_jobs/version.rb
 - lib/rabbit_jobs/worker.rb
 - lib/tasks/rabbit_jobs.rake
@@ -108,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 111001831721435723
+      hash: -2922787991343531885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 111001831721435723
+      hash: -2922787991343531885
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15