rabbit_jobs 0.0.7 → 0.0.8

data/lib/rabbit_jobs/error_mailer.rb

@@ -2,8 +2,6 @@
 
 module RabbitJobs
   class ErrorMailer
-    include RabbitJobs::Logger
-
     def self.enabled?
       !!RabbitJobs.config.mail_errors_from && !RabbitJobs.config.mail_errors_from.empty?
     end
@@ -30,7 +28,7 @@ module RabbitJobs
       begin
         letter.deliver
       rescue
-        log $!.inspect
+        RJ.logger.error $!.inspect
       end
     end
   end

data/lib/rabbit_jobs/job.rb

@@ -4,11 +4,9 @@ require 'digest/md5'
 
 module RabbitJobs::Job
   extend RabbitJobs::Helpers
-  extend RabbitJobs::Logger
   extend self
 
   def self.included(base)
-    include RabbitJobs::Logger
     base.extend (ClassMethods)
 
     def initialize(*perform_params)
@@ -21,7 +19,7 @@ module RabbitJobs::Job
     def run_perform
       if @child_pid = fork
         srand # Reseeding
-        RabbitJobs::Logger.log "Forked #{@child_pid} at #{Time.now} to process #{self.class}.perform(#{ params.map(&:inspect).join(', ') })"
+        RJ.logger.info "Forked #{@child_pid} at #{Time.now} to process #{self.class}.perform(#{ params.map(&:inspect).join(', ') })"
         Process.wait(@child_pid)
         yield if block_given?
       else
@@ -32,11 +30,11 @@ module RabbitJobs::Job
           if defined?(MongoMapper)
             MongoMapper.database.connection.connect_to_master
           end
-          # log 'before perform'
+          # RJ.logger.debug 'before perform'
           self.class.perform(*params)
-          # log 'after perform'
+          # RJ.logger.debug 'after perform'
         rescue
-          RabbitJobs::Logger.log($!.inspect) if RabbitJobs.config.error_log
+          RJ.logger.warn($!.inspect)
           RabbitJobs::ErrorMailer.send(self, $!)
 
           run_on_error_hooks($!)
@@ -113,10 +111,10 @@ module RabbitJobs::Job
       job.opts = encoded['opts']
       job
     rescue
-      log "JOB INIT ERROR at #{Time.now.to_s}:"
-      log $!.inspect
-      log $!.backtrace
-      log "message: #{payload.inspect}"
+      RJ.logger.error "JOB INIT ERROR at #{Time.now.to_s}:"
+      RJ.logger.error $!.inspect
+      RJ.logger.error $!.backtrace
+      RJ.logger.error "message: #{payload.inspect}"
       # Mailer.send(klass_name, params, $!)
       # raise $!
     end

data/lib/rabbit_jobs/scheduler.rb

@@ -7,7 +7,6 @@ require 'yaml'
 module RabbitJobs
   class Scheduler
     include AmqpHelpers
-    include Logger
 
     attr_accessor :pidfile, :background, :schedule
 
@@ -33,12 +32,12 @@ module RabbitJobs
         # job should be scheduled regardless of what ENV['RAILS_ENV'] is set
         # to.
         if config['rails_env'].nil? || rails_env_matches?(config)
-          log! "Scheduling #{name} "
+          RJ.logger.info "Scheduling #{name} "
           interval_defined = false
           interval_types = %w{cron every}
           interval_types.each do |interval_type|
             if !config[interval_type].nil? && config[interval_type].length > 0
-              log "queueing #{config['class']} (#{name})"
+              RJ.logger.info "queueing #{config['class']} (#{name})"
               rufus_scheduler.send(interval_type, config[interval_type]) do
                 publish_from_config(config)
               end
@@ -47,7 +46,7 @@ module RabbitJobs
             end
           end
           unless interval_defined
-            log! "no #{interval_types.join(' / ')} found for #{config['class']} (#{name}) - skipping"
+            RJ.logger.warn "no #{interval_types.join(' / ')} found for #{config['class']} (#{name}) - skipping"
           end
         end
       end
@@ -65,10 +64,10 @@ module RabbitJobs
       params = args.is_a?(Hash) ? [args] : Array(args)
       queue = config['queue'] || config[:queue] || RabbitJobs.config.routing_keys.first
 
-      log "publishing #{config}"
+      RJ.logger.info "publishing #{config}"
       RabbitJobs.publish_to(queue, klass_name.constantize, nil, *params)
     rescue
-      log! "Failed to publish #{klass_name}:\n #{$!}\n params = #{params.inspect}"
+      RJ.logger.warn "Failed to publish #{klass_name}:\n #{$!}\n params = #{params.inspect}"
     end
 
     def rufus_scheduler
@@ -107,7 +106,7 @@ module RabbitJobs
           end
         end
 
-        log "Scheduler started."
+        RJ.logger.info "Scheduler started."
 
         EM.add_periodic_timer(1) do
           check_shutdown.call
@@ -116,7 +115,7 @@ module RabbitJobs
     end
 
     def shutdown
-      log "Stopping scheduler..."
+      RJ.logger.warn "Stopping scheduler..."
       @shutdown = true
     end
 
@@ -146,11 +145,11 @@ module RabbitJobs
 
     def kill_child
       if @job && @job.child_pid
-        # log! "Killing child at #{@child}"
+        # RJ.logger.warn "Killing child at #{@child}"
         if Kernel.system("ps -o pid,state -p #{@job.child_pid}")
           Process.kill("KILL", @job.child_pid) rescue nil
         else
-          # log! "Child #{@child} not found, restarting."
+          # RJ.logger.warn "Child #{@child} not found, restarting."
           # shutdown
         end
       end

data/lib/rabbit_jobs/tasks.rb

@@ -2,8 +2,18 @@
 # will give you the resque tasks
 
 require 'rabbit_jobs'
+require 'logger'
 
 namespace :rj do
+  def initialize_rj_daemon(daemon)
+    daemon.pidfile = ENV['PIDFILE']
+    daemon.background = %w(yes true).include? ENV['BACKGROUND']
+    RJ.logger = ::Logger.new(ENV['LOGFILE']) if ENV['LOGFILE']
+    RJ.logger.level = ENV['VERBOSE'] ? Logger::INFO : Logger::WARN
+
+    worker
+  end
+
   task :setup
 
   desc "Start a Rabbit Jobs worker"
@@ -11,30 +21,14 @@ namespace :rj do
     require 'rabbit_jobs'
 
     queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')
-
-    begin
-      worker = RabbitJobs::Worker.new(*queues)
-      worker.pidfile = ENV['PIDFILE']
-      worker.background = %w(yes true).include? ENV['BACKGROUND']
-      RabbitJobs::Logger.verbose = true if ENV['VERBOSE']
-      # worker.very_verbose = ENV['VVERBOSE']
-    end
+    worker = initialize_rj_service(RJ::Worker.new(*queues))
 
     worker.work
   end
 
   desc "Start a Rabbit Jobs scheduler"
   task :scheduler => [ :preload, :setup ] do
-
-    queues = (ENV['SCHEDULE']).to_s.split(',')
-
-    begin
-      scheduler = RabbitJobs::Scheduler.new(*queues)
-      scheduler.pidfile = ENV['PIDFILE']
-      scheduler.background = %w(yes true).include? ENV['BACKGROUND']
-      RabbitJobs::Logger.verbose = true if ENV['VERBOSE']
-      # worker.very_verbose = ENV['VVERBOSE']
-    end
+    scheduler = initialize_rj_service(RabbitJobs::Scheduler.new)
 
     scheduler.work
   end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/rabbit_jobs/worker.rb

@@ -3,7 +3,6 @@
 module RabbitJobs
   class Worker
     include AmqpHelpers
-    include Logger
 
     attr_accessor :pidfile, :background
 
@@ -39,8 +38,8 @@ module RabbitJobs
 
         check_shutdown = Proc.new {
           if @shutdown
-            log "Processed jobs: #{processed_count}"
-            log "Stopping worker..."
+            RJ.logger.info "Processed jobs: #{processed_count}"
+            RJ.logger.info "Stopping worker..."
 
             connection.close {
               File.delete(self.pidfile) if self.pidfile
@@ -52,7 +51,7 @@ module RabbitJobs
         queues.each do |routing_key|
           queue = make_queue(exchange, routing_key)
 
-          log "Worker ##{Process.pid} <= #{exchange.name}##{routing_key}"
+          RJ.logger.info "Worker ##{Process.pid} <= #{exchange.name}##{routing_key}"
 
           explicit_ack = !!RJ.config[:queues][routing_key][:ack]
 
@@ -63,7 +62,7 @@ module RabbitJobs
               @job.run_perform
               processed_count += 1
             else
-              log "Job expired: #{@job.inspect}"
+              RJ.logger.info "Job expired: #{@job.inspect}"
             end
 
             metadata.ack if explicit_ack
@@ -115,11 +114,11 @@ module RabbitJobs
 
     def kill_child
       if @job && @job.child_pid
-        # log! "Killing child at #{@child}"
+        # RJ.logger.info "Killing child at #{@child}"
         if Kernel.system("ps -o pid,state -p #{@job.child_pid}")
           Process.kill("KILL", @job.child_pid) rescue nil
         else
-          # log! "Child #{@child} not found, restarting."
+          # RJ.logger.info "Child #{@child} not found, restarting."
           # shutdown
         end
       end

data/lib/rabbit_jobs.rb

@@ -5,7 +5,6 @@ require 'rabbit_jobs/version'
 require 'rabbit_jobs/helpers'
 require 'rabbit_jobs/amqp_helpers'
 require 'rabbit_jobs/configuration'
-require 'rabbit_jobs/logger'
 require 'rabbit_jobs/error_mailer'
 
 require 'rabbit_jobs/job'
@@ -13,6 +12,8 @@ require 'rabbit_jobs/publisher'
 require 'rabbit_jobs/worker'
 require 'rabbit_jobs/scheduler'
 
+require 'logger'
+
 module RabbitJobs
   extend self
 
@@ -23,6 +24,11 @@ module RabbitJobs
   def publish_to(routing_key, klass, opts = {}, *params)
     RabbitJobs::Publisher.publish_to(routing_key, klass, opts, *params)
   end
+
+  attr_writer :logger
+  def logger
+    @logger ||= Logger.new $stdout
+  end
 end
 
 RJ = RabbitJobs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70275283417720 !ruby/object:Gem::Requirement
+  requirement: &70110815973060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70275283417720
+  version_requirements: *70110815973060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70275283417300 !ruby/object:Gem::Requirement
+  requirement: &70110815972640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275283417300
+  version_requirements: *70110815972640
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70275283416760 !ruby/object:Gem::Requirement
+  requirement: &70110815972100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275283416760
+  version_requirements: *70110815972100
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -64,7 +64,6 @@ files:
 - lib/rabbit_jobs/error_mailer.rb
 - lib/rabbit_jobs/helpers.rb
 - lib/rabbit_jobs/job.rb
-- lib/rabbit_jobs/logger.rb
 - lib/rabbit_jobs/publisher.rb
 - lib/rabbit_jobs/scheduler.rb
 - lib/rabbit_jobs/tasks.rb
@@ -81,7 +80,6 @@ files:
 - spec/spec_helper.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/job_spec.rb
-- spec/unit/logger_spec.rb
 - spec/unit/mailer_spec.rb
 - spec/unit/rabbit_jobs_spec.rb
 - spec/unit/worker_spec.rb
@@ -119,7 +117,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/job_spec.rb
-- spec/unit/logger_spec.rb
 - spec/unit/mailer_spec.rb
 - spec/unit/rabbit_jobs_spec.rb
 - spec/unit/worker_spec.rb

data/lib/rabbit_jobs/logger.rb

@@ -1,18 +0,0 @@
-module RabbitJobs
-  module Logger
-    extend self
-
-    def log(string)
-      puts string
-    end
-
-    def log!(string)
-      @@verbose ||= false
-      log(string) if RabbitJobs::Logger.verbose
-    end
-
-    class << self
-      attr_accessor :verbose
-    end
-  end
-end

data/spec/unit/logger_spec.rb

@@ -1,23 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe RabbitJobs::Logger do
-  it '#log should write messages to stdout' do
-    mock($stdout).puts "hello"
-    RabbitJobs::Logger.log("hello")
-  end
-
-  it '#log! should not write messages to stdout in normal mode' do
-    RabbitJobs::Logger.verbose = false
-
-    dont_allow(RabbitJobs::Logger).log("hello")
-    RabbitJobs::Logger.log!("hello")
-  end
-
-  it '#log! should write messages to stdout in verbose mode' do
-    RabbitJobs::Logger.verbose = true
-
-    mock(RabbitJobs::Logger).log("hello")
-    RabbitJobs::Logger.log!("hello")
-  end
-end