quebert 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bda9cb5709ea354e0ccb9822af9866fc9074795
-  data.tar.gz: 45923c3de44f7d15397732d30448931540847f50
+  metadata.gz: 016b1258661f9dbac4d3d3dd2c53b482d0d7c80f
+  data.tar.gz: ec28cd67f06d964274b67bccfb3605cf7fc49326
 SHA512:
-  metadata.gz: 41ad3f71924915e1ce6341b45cd8f079925dc2cfba0859bd2282d6eabf448a192841065663d0871c83830553f7b2eeb5029d6f1f5ec0f0be5c8a0a4d830dfea1
-  data.tar.gz: 466dd771292f13cae5fc7f876c23dea8bb9935dcc396a4d0fbe0e5e537f13024e6e68af71864f61e154a68f6145ee31d8e9364b90463f2dd46bcbfbb2a65e398
+  metadata.gz: caf6fd9be90fbe25b6890864c031dce330cd30ffa14672ec25d02d04e46a08dd155081210e64bcb38f3383ead08ad588ece9c5a1be69a7b31c1a2c37ea83f191
+  data.tar.gz: b8140800516ec10fd31e6fe12a36e5db6b123be6e2942b5ef111f8dd0c05b7c44cf652daeb99c94c5e2e57575c403e5975fb24da51038b2cb779508d42bb5348

data/README.md

@@ -1,6 +1,6 @@
 # Quebert
 
-[![Build Status](https://travis-ci.org/polleverywhere/quebert.png?branch=master)](https://travis-ci.org/polleverywhere/quebert)
+[![Build Status](https://travis-ci.org/polleverywhere/quebert.png?branch=master)](https://travis-ci.org/polleverywhere/quebert) [![Code Climate](https://codeclimate.com/repos/555266fc6956805b9e0033b5/badges/008e51483e8e268f21db/gpa.svg)](https://codeclimate.com/repos/555266fc6956805b9e0033b5/feed)
 
 async_observer is great, but is dated and doesn't really support running jobs outside of the async_send idiom. Quebert is an attempt to mix how jobs are run in other popular worker queue frameworks, like resque and dj, with async_observer so that you can have it both ways.
 

data/lib/quebert/controller/beanstalk.rb

@@ -15,24 +15,15 @@ module Quebert
       def initialize(beanstalk_job)
         @beanstalk_job = beanstalk_job
         @job = Job.from_json(beanstalk_job.body)
-      rescue Job::Delete
-        beanstalk_job.delete
-        job_log "Deleted on initialization", :error
-      rescue Job::Release
-        beanstalk_job.release job.priority, job.delay
-        job_log "Released on initialization with priority: #{job.priority} and delay: #{job.delay}", :error
-      rescue Job::Bury
-        beanstalk_job.bury
-        job_log "Buried on initialization", :error
       rescue => e
         beanstalk_job.bury
-        job_log "Error caught on initialization. #{e.inspect}", :error
+        logger.error "Error caught on initialization. #{e.inspect}"
         raise
       end
 
       def perform
-        job_log "Performing with args #{job.args.inspect}"
-        job_log "Beanstalk Job Stats: #{beanstalk_job.stats.inspect}"
+        logger.error(job) { "Performing with args #{job.args.inspect}" }
+        logger.error(job) { "Beanstalk Job Stats: #{beanstalk_job.stats.inspect}" }
 
         result = false
         time = Benchmark.realtime do
@@ -40,33 +31,33 @@ module Quebert
           beanstalk_job.delete
         end
 
-        job_log "Completed in #{(time*1000*1000).to_i/1000.to_f} ms\n"
+        logger.error(job) { "Completed in #{(time*1000*1000).to_i/1000.to_f} ms\n" }
         result
       rescue Job::Delete
-        job_log "Deleting job", :error
+        logger.info(job) { "Deleting job" }
         beanstalk_job.delete
-        job_log "Job deleted", :error
+        logger.info(job) { "Job deleted" }
       rescue Job::Release
-        job_log "Releasing with priority: #{job.priority} and delay: #{job.delay}", :error
+        logger.info(job) { "Releasing with priority: #{job.priority} and delay: #{job.delay}" }
         beanstalk_job.release :pri => job.priority, :delay => job.delay
-        job_log "Job released", :error
+        logger.info(job) { "Job released" }
       rescue Job::Bury
-        job_log "Burrying job", :error
+        logger.info(job) { "Burrying job" }
         beanstalk_job.bury
-        job_log "Job burried", :error
+        logger.info(job) { "Job buried" }
       rescue Job::Timeout => e
-        job_log "Job timed out. Retrying with delay. #{e.inspect} #{e.backtrace.join("\n")}", :error
+        logger.info(job) { "Job timed out. Retrying with delay. #{e.inspect} #{e.backtrace.join("\n")}" }
         retry_with_delay
         raise
       rescue Job::Retry
         # The difference between the Retry and Timeout class is that
-        # Retry does not job_log an exception where as Timeout does
-        job_log "Manually retrying with delay"
+        # Retry does not logger.error(job) { an exception where as Timeout does }
+        logger.info(job) { "Manually retrying with delay" }
         retry_with_delay
       rescue => e
-        job_log "Error caught on perform. Burying job. #{e.inspect} #{e.backtrace.join("\n")}", :error
+        logger.error(job) { "Error caught on perform. Burying job. #{e.inspect} #{e.backtrace.join("\n")}" }
         beanstalk_job.bury
-        job_log "Job buried", :error
+        logger.error(job) { "Job buried" }
         raise
       end
 
@@ -75,28 +66,19 @@ module Quebert
         delay = TIMEOUT_RETRY_DELAY_SEED + TIMEOUT_RETRY_GROWTH_RATE**beanstalk_job.stats["releases"].to_i
 
         if delay > MAX_TIMEOUT_RETRY_DELAY
-          job_log "Max retry delay exceeded. Burrying job"
+          logger.error(job) { "Max retry delay exceeded. Burrying job" }
           beanstalk_job.bury
-          job_log "Job burried"
+          logger.error(job) { "Job buried" }
         else
-          job_log "TTR exceeded. Releasing with priority: #{job.priority} and delay: #{delay}"
+          logger.error(job) { "TTR exceeded. Releasing with priority: #{job.priority} and delay: #{delay}" }
           beanstalk_job.release :pri => job.priority, :delay => delay
-          job_log "Job released"
+          logger.error(job) { "Job released" }
         end
       rescue ::Beaneater::NotFoundError
-        job_log "Job ran longer than allowed. Beanstalk already deleted it!!!!", :error
+        logger.error(job) { "Job ran longer than allowed. Beanstalk already deleted it!!!!" }
         # Sometimes the timer doesn't behave correctly and this job actually runs longer than
         # allowed. At that point the beanstalk job no longer exists anymore. Lets let it go and don't blow up.
       end
-
-      def job_log(message, level=:info)
-        # Have the job write to the log file so that we catch the details of the job
-        if job
-          job.send(:log, message, level)
-        else
-          Quebert.logger.send(level, message)
-        end
-      end
     end
   end
 end

data/lib/quebert/job.rb

@@ -23,7 +23,6 @@ module Quebert
 
     # Exceptions are used for signaling job status... ewww. Yank this out and
     # replace with a more well thought out controller.
-    NotImplemented = Class.new(StandardError)
     Action  = Class.new(Exception)
     Bury    = Class.new(Action)
     Delete  = Class.new(Action)
@@ -41,7 +40,7 @@ module Quebert
     end
 
     def perform(*args)
-      raise NotImplemented
+      raise NotImplementedError
     end
 
     # Runs the perform method that somebody else should be implementing

data/lib/quebert/logging.rb

@@ -1,13 +1,8 @@
 module Quebert
   module Logging
-    protected
+    private
     def logger
-      @logger ||= Quebert.logger
-    end
-    
-     # Making logging jobs a tiny bit easier..
-    def log(message, level=:info)
-      logger.send(level, "[##{self.object_id} #{self.class.name}] : #{message}")
+      Quebert.logger
     end
   end
 end

data/lib/quebert/version.rb

@@ -1,3 +1,3 @@
 module Quebert
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/spec/job_spec.rb

@@ -21,7 +21,7 @@ describe Quebert::Job do
   it "should raise not implemented on base job" do
     lambda {
       Job.new.perform
-    }.should raise_exception(Quebert::Job::NotImplemented)
+    }.should raise_exception(NotImplementedError)
   end
 
   it "should convert job to and from JSON" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quebert
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Brad Gessler
@@ -149,3 +149,4 @@ test_files:
 - spec/support/jobs.rb
 - spec/support_spec.rb
 - spec/worker_spec.rb
+has_rdoc: