rabbit_jobs 0.4.4 → 0.4.5

data/lib/rabbit_jobs/amqp_helper.rb

@@ -14,7 +14,7 @@ module RabbitJobs
 
       def prepare_connection
         if !AMQP.connection || AMQP.connection.closed?
-          RJ.logger.info("rj[##{Process.pid}] Connecting to #{RJ.config.servers.first.to_s}...")
+          RJ.logger.info("Connecting to #{RJ.config.servers.first.to_s}...")
           AMQP.connection = AMQP.connect(RJ.config.servers.first, auto_recovery: true)
           init_auto_recovery
         end
@@ -32,15 +32,15 @@ module RabbitJobs
             HOSTS_DEAD.clear
             HOSTS_FAILED.clear
             url = url_from_opts opts
-            RJ.logger.warn "rj[##{Process.pid}] Connection to #{url} recovered."
+            RJ.logger.warn "Connection to #{url} recovered."
           end
 
           AMQP.connection.on_open do |conn, opts|
-            RJ.logger.info "rj[##{Process.pid}] Connected."
+            RJ.logger.info "Connected."
           end
 
           # AMQP.connection.before_recovery do |conn, opts|
-          #   RJ.logger.info "rj[##{Process.pid}] before_recovery"
+          #   RJ.logger.info "before_recovery"
           # end
 
           # AMQP.connection.on_possible_authentication_failure do |conn, opts|
@@ -87,10 +87,10 @@ module RabbitJobs
 
       def reconnect_to(url)
         if AMQP.connection
-          RJ.logger.warn "rj[##{Process.pid}] Trying to reconnect to #{url}..."
+          RJ.logger.warn "Trying to reconnect to #{url}..."
           AMQP.connection.reconnect_to(url, 2)
         else
-          RJ.logger.warn "rj[##{Process.pid}] Trying to connect to #{url}..."
+          RJ.logger.warn "Trying to connect to #{url}..."
           AMQP.connection = AMQP.connect(url, auto_recovery: true)
           init_auto_recovery
         end

data/lib/rabbit_jobs/job.rb

@@ -19,10 +19,10 @@ module RabbitJobs::Job
     def run_perform
       begin
         start_time = Time.now
-        RJ.logger.info "rj_worker[##{Process.pid}] performing #{self.to_ruby_string} at #{start_time.utc}"
+        RJ.logger.info "Started to perform #{self.to_ruby_string}"
         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."
+        RJ.logger.info "     Job completed #{self.to_ruby_string} in #{execution_time} seconds."
       rescue
         RJ.logger.warn $!.message
         RJ.logger.warn(self.to_ruby_string)
@@ -116,11 +116,11 @@ module RabbitJobs::Job
       RJ.logger.error "Cannot find job class '#{encoded['class']}'"
       :not_found
     rescue JSON::ParserError
-      RJ.logger.error "rj[##{Process.pid}] Cannot initialize job. Json parsing error."
-      RJ.logger.error "rj[##{Process.pid}] Data received: #{payload.inspect}"
+      RJ.logger.error "Cannot initialize job. Json parsing error."
+      RJ.logger.error "Data received: #{payload.inspect}"
       :parsing_error
     rescue
-      RJ.logger.warn "rj[##{Process.pid}] Cannot initialize job."
+      RJ.logger.warn "Cannot initialize job."
       RJ.logger.warn $!.message
       RJ.logger.warn RJ::Util.cleanup_backtrace($!.backtrace).join("\n")
       RJ.logger.warn "Data received: #{payload.inspect}"

data/lib/rabbit_jobs/scheduler.rb

@@ -98,7 +98,7 @@ module RabbitJobs
           check_shutdown = Proc.new {
             if @shutdown
               RJ.stop
-              RJ.logger.info "rj_scheduler[##{Process.pid}] stopped."
+              RJ.logger.info "Stopped."
 
               File.delete(self.pidfile) if self.pidfile
             end
@@ -114,7 +114,7 @@ module RabbitJobs
             check_shutdown.call
           end
 
-          RJ.logger.info "rj_scheduler[##{Process.pid}] started."
+          RJ.logger.info "Started."
         end
       rescue => e
         error = $!
@@ -131,7 +131,7 @@ module RabbitJobs
     end
 
     def shutdown
-      RJ.logger.info "rj_scheduler[##{Process.pid}] stopping..."
+      RJ.logger.info "Stopping..."
       @shutdown = true
     end
 

data/lib/rabbit_jobs/tasks.rb

@@ -42,7 +42,9 @@ namespace :rj do
             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.level = ENV['VERBOSE'] ? Logger::INFO : Logger::WARN
+            RJ.logger.formatter = nil
+            RJ.logger.progname = 'rj_worker'
+            RJ.logger.level = Logger::INFO if ENV['VERBOSE']
             puts "Starting #{worker_name}##{worker_num}"
 
             # завершаем копию процесса, если воркер уже отработал
@@ -162,7 +164,9 @@ namespace :rj do
       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.level = ENV['VERBOSE'] ? Logger::INFO : Logger::WARN
+      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."

data/lib/rabbit_jobs/version.rb

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

data/lib/rabbit_jobs/worker.rb

@@ -40,8 +40,8 @@ module RabbitJobs
           check_shutdown = Proc.new {
             if @shutdown
               RJ.stop
-              RJ.logger.info "rj_worker[##{Process.pid}] processed jobs: #{processed_count}."
-              RJ.logger.info "rj_worker[##{Process.pid}] stopped."
+              RJ.logger.info "Processed jobs: #{processed_count}."
+              RJ.logger.info "Stopped."
 
               File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
               # RJ.logger.close
@@ -54,7 +54,7 @@ module RabbitJobs
           queues.each do |routing_key|
             AMQP.channel.prefetch(1)
             AMQP.channel.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key]) { |queue, declare_ok|
-              RJ.logger.info "rj_worker[##{Process.pid}] subscribed to #{RJ.config.queue_name(routing_key)} (#{declare_ok.to_i + 1})"
+              RJ.logger.info "Subscribed to #{RJ.config.queue_name(routing_key)}(#{declare_ok.to_i + 1})"
 
               explicit_ack = !!RJ.config[:queues][routing_key][:ack]
 
@@ -70,7 +70,7 @@ module RabbitJobs
                   metadata.ack if explicit_ack
                 else
                   if @job.expired?
-                    RJ.logger.warn "rj_worker[##{Process.pid}] Job expired: #{@job.to_ruby_string}"
+                    RJ.logger.warn "Job expired: #{@job.to_ruby_string}"
                   else
                     @job.run_perform
                     processed_count += 1
@@ -95,7 +95,7 @@ module RabbitJobs
             check_shutdown.call
           end
 
-          RJ.logger.info "rj_worker[##{Process.pid}] started."
+          RJ.logger.info "Started."
         end
       rescue
         error = $!

data/lib/rabbit_jobs.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &6815860 !ruby/object:Gem::Requirement
+  requirement: &10959520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *6815860
+  version_requirements: *10959520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6814800 !ruby/object:Gem::Requirement
+  requirement: &10958660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6814800
+  version_requirements: *10958660
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &6814000 !ruby/object:Gem::Requirement
+  requirement: &10957860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *6814000
+  version_requirements: *10957860
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &6812800 !ruby/object:Gem::Requirement
+  requirement: &10957020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *6812800
+  version_requirements: *10957020
 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: 4510837792608330592
+      hash: 1163928231498999905
 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: 4510837792608330592
+      hash: 1163928231498999905
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11