rabbit_jobs 0.5.9 → 0.6.0

data/lib/rabbit_jobs/configuration.rb

@@ -201,10 +201,6 @@ 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/tasks.rb

@@ -1,6 +1,3 @@
-# require 'rabbit_jobs/tasks'
-# will give you the resque tasks
-
 require 'rabbit_jobs'
 require 'logger'
 require 'rake'
@@ -22,202 +19,23 @@ end
 
 namespace :rj do
   task :environment do
-    # Rails.application.eager_load!
     Rails.application.require_environment!
   end
 
-  # MULTIPROCESS
-  namespace :worker do
-    desc "Start a Rabbit Jobs workers from config/rj_workers.yml"
-    task :start => [:environment, :load_config] do
-      make_dirs
-      RJ.config.workers.each do |worker_name, worker_props|
-        (1..worker_props[:instances].to_i).each do |worker_num|
-          unless @do_only.count > 0 && !@do_only.include?("#{worker_name}-#{worker_num}")
-            queues = (worker_props[:queue] || worker_props[:queues] || "").split(' ')
-
-            worker = RJ::Worker.new(*queues)
-            worker.background = true
-            worker.process_name = "rj_worker #{worker_name}##{worker_num} #{rails_env} [#{queues.join(',')}]"
-            worker.pidfile = app_root.join("tmp/pids/rj_worker_#{rails_env}_#{worker_name}_#{worker_num}.pid")
-            RJ.logger = ::Logger.new(app_root.join("log/rj_worker_#{rails_env}_#{worker_name}_#{worker_num}.log"), 'daily')
-            RJ.logger.formatter = nil
-            RJ.logger.progname = 'rj_worker'
-            RJ.logger.level = Logger::INFO if ENV['VERBOSE']
-            puts "Starting #{worker_name}##{worker_num}"
-
-            # завершаем копию процесса, если воркер уже отработал
-            exit! if worker.work
-          end
-        end
-      end
-    end
-
-    task :stop => :load_config do
-      # получаем идентификаторы процессов
-      pids = {}
-      errors = []
-
-      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}")
-            pidfile = app_root.join("tmp/pids/rj_worker_#{rails_env}_#{worker_name}_#{worker_num}.pid")
-
-            unless File.exists?(pidfile)
-              msg = "Pidfile not found: #{pidfile}"
-              errors << msg
-              $stderr.puts msg
-            else
-              pid = open(pidfile).read.to_i
-              pids[pid] = pidfile
-              queues = (worker_props[:queue] || worker_props[:queues] || "").split(' ')
-              puts "Stopping rj_worker #{worker_name}##{worker_num} #{rails_env} [#{queues.join(',')}]"
-            end
-          end
-          worker_num += 1
-        end
-      end
-
-      # пытаемся их убить
-      killed_pids = []
-      pids.each do |pid, pidfile|
-        begin
-          puts "try killing ##{pid}"
-          Process.kill("TERM", pid)
-        rescue => e
-          errors << "Not found process: #{pid} from #{pidfile}"
-          $stderr.puts errors.last
-          $stderr.puts "Removing pidfile ..."
-          File.delete(pidfile) if File.exist?(pidfile)
-        end
-      end
-
-      while killed_pids.count != pids.keys.count
-        pids.each_key do |pid|
-          begin
-            Process.kill(0, pid)
-            stopped = false
-            break
-          rescue
-            killed_pids.push(pid) unless killed_pids.include?(pid)
-          end
-        end
-        print '.'
-        sleep 1
-      end
-
-      fail(errors.join("\r\n")) if not errors.empty?
-
-      puts "\nrj_worker stopped."
-    end
-
-    task :status => :load_config do
-      errors = []
-
-      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)
-            errors << "Pidfile not found: #{pidfile}"
-          else
-            pid = open(pidfile).read.to_i
-            begin
-              raise "must return 1" unless Process.kill(0, pid) == 1
-            rescue
-              errors << "Pidfile found but process not respond: #{pidfile}\r\nRemoving pidfile."
-              File.delete(pidfile) if File.exist?(pidfile)
-            end
-          end
-          worker_num += 1
-        end
-      end
-
-      if errors.empty?
-        puts "ok"
-      else
-        fail errors.join("\r\n")
-      end
-    end
-
-    task :load_config do
-      @do_only = ENV["WORKERS"] ? ENV["WORKERS"].strip.split : []
-      @do_only.each do |worker|
-        worker_name, worker_num = worker.split('-')
-        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
-    end
+  desc "Start a Rabbit Jobs worker"
+  task :worker => :environment do
+    queues = (ENV['QUEUES'] || ENV['QUEUES'] || "").split(',')
+    make_dirs
+    worker = RJ::Worker.new(*queues)
+    worker.process_name = "rj_worker #{rails_env} [#{queues.join(',')}]"
+    exit(worker.work)
   end
 
-  namespace :scheduler do
-    task :start do
-      make_dirs
-
-      scheduler = RabbitJobs::Scheduler.new
-
-      scheduler.background = true
-      scheduler.pidfile = app_root.join('tmp/pids/rj_scheduler.pid')
-      RJ.logger = ::Logger.new(app_root.join('log/rj_scheduler.log'), 'daily')
-      RJ.logger.formatter = nil
-      RJ.logger.progname = 'rj_scheduler'
-      RJ.logger.level = Logger::INFO if ENV['VERBOSE']
-
-      exit! if scheduler.work
-      puts "rj_scheduler started."
-    end
-
-    task :stop do
-      pidfile = app_root.join('tmp/pids/rj_scheduler.pid')
-
-      unless File.exists?(pidfile)
-        fail "Pidfile not found: #{pidfile}"
-      else
-        pid = open(pidfile).read.to_i
-        begin
-          Process.kill("TERM", pid)
-        rescue => e
-          $stderr.puts "Not found process: #{pid} from #{pidfile}"
-          $stderr.puts "Removing pidfile ..."
-          File.delete(pidfile) if File.exist?(pidfile)
-          fail "Not found process: #{pid} from #{pidfile}"
-        end
-
-        while true
-          begin
-            Process.kill(0, pid)
-            sleep 0.1
-          rescue
-            puts "rj_scheduler[##{pid}] stopped."
-            break
-          end
-        end
-      end
-    end
-
-    task :status do
-      pidfile = app_root.join('tmp/pids/rj_scheduler.pid')
-
-      unless File.exists?(pidfile)
-        # puts "Pidfile not found: #{pidfile}"
-        fail "Pidfile not found: #{pidfile}"
-      else
-        pid = open(pidfile).read.to_i
-        begin
-          raise "must return 1" unless Process.kill(0, pid) == 1
-          puts "ok"
-        rescue
-          puts "Pidfile found but process not respond: #{pidfile}"
-          puts "Removing pidfile."
-          File.delete(pidfile) if File.exist?(pidfile)
-          fail "Pidfile found but process not respond: #{pidfile}"
-        end
-      end
-    end
+  desc "Start a Rabbit Jobs scheduler"
+  task :scheduler do
+    make_dirs
+    scheduler = RabbitJobs::Scheduler.new
+    scheduler.process_name = "rj_scheduler #{rails_env}"
+    exit(scheduler.work)
   end
-
-  # desc "Start a Rabbit Jobs scheduler"
 end

data/lib/rabbit_jobs/version.rb

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

data/lib/rabbit_jobs.rb

@@ -115,7 +115,7 @@ module RabbitJobs
   def logger
     unless @logger
       @logger = Logger.new($stdout)
-      @logger.level = Logger::WARN
+      @logger.level = Logger::INFO
       @logger.formatter = nil
       @logger.progname = 'rj'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &21322560 !ruby/object:Gem::Requirement
+  requirement: &16471900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *21322560
+  version_requirements: *16471900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21321760 !ruby/object:Gem::Requirement
+  requirement: &16468700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21321760
+  version_requirements: *16468700
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &21344180 !ruby/object:Gem::Requirement
+  requirement: &16490220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21344180
+  version_requirements: *16490220
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &21342820 !ruby/object:Gem::Requirement
+  requirement: &16485260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21342820
+  version_requirements: *16485260
 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: -3368029020513030695
+      hash: -155870681663292308
 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: -3368029020513030695
+      hash: -155870681663292308
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11