rabbit_jobs 0.3 → 0.4.4

data/lib/rabbit_jobs/configuration.rb

@@ -58,9 +58,10 @@ module RabbitJobs
     def initialize
       @data = {
         error_log: true,
+        workers: HashWithIndifferentAccess.new,
         servers: [],
         prefix: 'rabbit_jobs',
-        queues: {}
+        queues: HashWithIndifferentAccess.new
       }
     end
 
@@ -130,6 +131,25 @@ module RabbitJobs
       end
     end
 
+    def workers
+      @data[:workers] ||= HashWithIndifferentAccess.new
+    end
+
+    def worker(name, params = {})
+      raise ArgumentError.new("name is #{name.inspect}") unless name && name.is_a?(String) && name != ""
+      raise ArgumentError.new("params is #{params.inspect}") unless params && params.is_a?(Hash)
+      raise ArgumentError.new("params should have :instances and :queues keys.") unless params[:instances] && params[:queues]
+
+      name = name.downcase
+
+      @data[:workers] ||= HashWithIndifferentAccess.new
+      if @data[:workers][name]
+        @data[:workers][name].merge!(params)
+      else
+        @data[:workers][name] = params
+      end
+    end
+
     def routing_keys
       @data[:queues].keys
     end
@@ -171,6 +191,10 @@ module RabbitJobs
         yaml['queues'].each do |name, params|
           queue name, symbolize_keys!(params) || {}
         end
+
+        yaml['workers'].each do |name, params|
+          worker name, symbolize_keys!(params) || {}
+        end
       end
     end
 

data/lib/rabbit_jobs/job.rb

@@ -18,8 +18,11 @@ module RabbitJobs::Job
 
     def run_perform
       begin
-        RJ.logger.info "rj_worker[##{Process.pid}] performing #{self.to_ruby_string}"
+        start_time = Time.now
+        RJ.logger.info "rj_worker[##{Process.pid}] performing #{self.to_ruby_string} at #{start_time.utc}"
         self.class.perform(*params)
+        execution_time = Time.now - start_time
+        RJ.logger.info "rj_worker[##{Process.pid}] processed  #{self.to_ruby_string} in #{execution_time} seconds."
       rescue
         RJ.logger.warn $!.message
         RJ.logger.warn(self.to_ruby_string)

data/lib/rabbit_jobs/scheduler.rb

@@ -97,10 +97,10 @@ module RabbitJobs
 
           check_shutdown = Proc.new {
             if @shutdown
-              RJ.stop {
-                File.delete(self.pidfile) if self.pidfile
-              }
+              RJ.stop
               RJ.logger.info "rj_scheduler[##{Process.pid}] stopped."
+
+              File.delete(self.pidfile) if self.pidfile
             end
           }
 
@@ -117,8 +117,14 @@ module RabbitJobs
           RJ.logger.info "rj_scheduler[##{Process.pid}] started."
         end
       rescue => e
-        RJ.logger.error e.message
-        RJ.logger.error e.backtrace.join("\r\n")
+        error = $!
+        if RJ.logger
+          begin
+            RJ.logger.error [error.message, error.backtrace].flatten.join("\n")
+          ensure
+            abort(error.message)
+          end
+        end
       end
 
       true

data/lib/rabbit_jobs/tasks.rb

@@ -31,7 +31,7 @@ namespace :rj do
     desc "Start a Rabbit Jobs workers from config/rj_workers.yml"
     task :start => [:environment, :load_config] do
       make_dirs
-      @rj_config.each do |worker_name, worker_props|
+      RJ.config.workers.each do |worker_name, worker_props|
         worker_num = 1
         worker_props['instances'].to_i.times do
           unless @do_only.count > 0 && !@do_only.include?("#{worker_name}-#{worker_num}")
@@ -58,7 +58,7 @@ namespace :rj do
       pids = {}
       errors = []
 
-      @rj_config.each do |worker_name, worker_props|
+      RJ.config.workers.each do |worker_name, worker_props|
         worker_num = 1
         worker_props['instances'].to_i.times do
           unless (@do_only.count > 0) && !@do_only.include?("#{worker_name}-#{worker_num}")
@@ -107,50 +107,46 @@ namespace :rj do
         sleep 1
       end
 
-      exit(1) if not errors.empty?
+      fail(errors.join("\r\n")) if not errors.empty?
 
       puts "\nrj_worker stopped."
-      exit(0)
     end
 
     task :status => :load_config do
+      errors = []
 
-      errors ||= 0
-
-      @rj_config.each do |worker_name, worker_props|
+      RJ.config.workers.each do |worker_name, worker_props|
         worker_num = 1
         worker_props['instances'].to_i.times do
           pidfile = app_root.join("tmp/pids/rj_worker_#{rails_env}_#{worker_name}_#{worker_num}.pid")
 
           unless File.exists?(pidfile)
-            puts "Pidfile not found: #{pidfile}"
-            errors += 1
+            errors << "Pidfile not found: #{pidfile}"
           else
             pid = open(pidfile).read.to_i
             begin
               raise "must return 1" unless Process.kill(0, pid) == 1
             rescue
-              puts "Pidfile found but process not respond: #{pidfile}\r\nRemoving pidfile."
+              errors << "Pidfile found but process not respond: #{pidfile}\r\nRemoving pidfile."
               File.delete(pidfile) if File.exist?(pidfile)
-              errors += 1
             end
           end
           worker_num += 1
         end
       end
 
-      puts "ok" if errors == 0
-      exit errors
+      if errors.empty?
+        puts "ok"
+      else
+        fail errors.join("\r\n")
+      end
     end
 
     task :load_config do
-      @rj_config = YAML.load(open app_root.join("config/rj_workers.yml"))
-      @rj_config = @rj_config[rails_env]
-
       @do_only = ENV["WORKERS"] ? ENV["WORKERS"].strip.split : []
       @do_only.each do |worker|
         worker_name, worker_num = worker.split('-')
-        unless @rj_config.keys.include?(worker_name) && @rj_config[worker_name]['instances'].to_i >= worker_num.to_i
+        unless RJ.config.workers.keys.include?(worker_name) && RJ.config.workers[worker_name][:instances].to_i >= worker_num.to_i
           raise "Worker #{worker} not found."
         end
       end
@@ -168,7 +164,7 @@ namespace :rj do
       RJ.logger = ::Logger.new(app_root.join('log/rj_scheduler.log'), 'daily')
       # RJ.logger.level = ENV['VERBOSE'] ? Logger::INFO : Logger::WARN
 
-      scheduler.work
+      exit! if scheduler.work
       puts "rj_scheduler started."
     end
 
@@ -176,9 +172,7 @@ namespace :rj do
       pidfile = app_root.join('tmp/pids/rj_scheduler.pid')
 
       unless File.exists?(pidfile)
-        msg = "Pidfile not found: #{pidfile}"
-        $stderr.puts msg
-        exit(1)
+        fail "Pidfile not found: #{pidfile}"
       else
         pid = open(pidfile).read.to_i
         begin
@@ -187,7 +181,7 @@ namespace :rj do
           $stderr.puts "Not found process: #{pid} from #{pidfile}"
           $stderr.puts "Removing pidfile ..."
           File.delete(pidfile) if File.exist?(pidfile)
-          exit(1)
+          fail "Not found process: #{pid} from #{pidfile}"
         end
 
         while true
@@ -196,7 +190,7 @@ namespace :rj do
             sleep 0.1
           rescue
             puts "rj_scheduler[##{pid}] stopped."
-            exit(0)
+            break
           end
         end
       end
@@ -206,8 +200,8 @@ namespace :rj do
       pidfile = app_root.join('tmp/pids/rj_scheduler.pid')
 
       unless File.exists?(pidfile)
-        puts "Pidfile not found: #{pidfile}"
-        exit(1)
+        # puts "Pidfile not found: #{pidfile}"
+        fail "Pidfile not found: #{pidfile}"
       else
         pid = open(pidfile).read.to_i
         begin
@@ -217,10 +211,9 @@ namespace :rj do
           puts "Pidfile found but process not respond: #{pidfile}"
           puts "Removing pidfile."
           File.delete(pidfile) if File.exist?(pidfile)
-          exit(1)
+          fail "Pidfile found but process not respond: #{pidfile}"
         end
       end
-      exit(0)
     end
   end
 

data/lib/rabbit_jobs/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module RabbitJobs
-  VERSION = "0.3"
+  VERSION = "0.4.4"
 end

data/lib/rabbit_jobs/worker.rb

@@ -39,11 +39,11 @@ module RabbitJobs
         RJ.run do
           check_shutdown = Proc.new {
             if @shutdown
-              RJ.stop {
-                File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
-              }
+              RJ.stop
               RJ.logger.info "rj_worker[##{Process.pid}] processed jobs: #{processed_count}."
               RJ.logger.info "rj_worker[##{Process.pid}] stopped."
+
+              File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
               # RJ.logger.close
               # exit!
             end

data/lib/rabbit_jobs.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require 'logger'
+require 'rake'
 
 require 'rabbit_jobs/version'
 
@@ -12,8 +14,7 @@ require 'rabbit_jobs/job'
 require 'rabbit_jobs/publisher'
 require 'rabbit_jobs/worker'
 require 'rabbit_jobs/scheduler'
-
-require 'logger'
+require 'rabbit_jobs/tasks'
 
 module RabbitJobs
   extend self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &16813080 !ruby/object:Gem::Requirement
+  requirement: &6815860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *16813080
+  version_requirements: *6815860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16811500 !ruby/object:Gem::Requirement
+  requirement: &6814800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16811500
+  version_requirements: *6814800
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &16809880 !ruby/object:Gem::Requirement
+  requirement: &6814000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16809880
+  version_requirements: *6814000
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &16808180 !ruby/object:Gem::Requirement
+  requirement: &6812800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16808180
+  version_requirements: *6812800
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3349151042287683745
+      hash: 4510837792608330592
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3349151042287683745
+      hash: 4510837792608330592
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11