stalking 0.0.6 → 0.0.7

data/lib/stalking/consumer.rb

@@ -56,7 +56,7 @@ module Stalking
         end
       end
     rescue EOFError, Beanstalk::NotConnected => e
-      log_error e
+      @logger.andand.error e.message
 
       sleep 1
 
@@ -64,7 +64,7 @@ module Stalking
 
       retry
     rescue => e
-      log_error e
+      @logger.andand.error e.message
 
       raise e
     end
@@ -98,7 +98,7 @@ module Stalking
 
       @connection
     rescue Beanstalk::NotConnected => e
-      log_error e
+      @logger.andand.error e.message
 
       sleep 1
 
@@ -112,10 +112,6 @@ module Stalking
 
       connect
     end
-
-    def log_error(e)
-      @logger.error("Stalking error: #{e.message}") if @logger
-    end
   end
 end
 

data/lib/stalking/producer.rb

@@ -18,11 +18,13 @@ module Stalking
     end
 
     def enqueue(name, args = {}, options = {})
+      @logger.andand.info "Enqueue #{name.inspect} with #{args.inspect} and #{options.inspect}"
+
       # Send the job to a random server.
 
       @servers.shuffle.first(@tries).each do |server|
         begin
-          Timeout::timeout(@timeout) do
+          Timeout::timeout @timeout do
             @connections[server] ||= Beanstalk::Pool.new([server])
 
             enq @connections[server], name, args, options
@@ -34,7 +36,7 @@ module Stalking
           # Let's try to reconnect and enqueue afterwards.
 
           begin
-            Timeout::timeout(@timeout) do
+            Timeout::timeout @timeout do
               @connections[server] = Beanstalk::Pool.new([server])
 
               enq @connections[server], name, args, options
@@ -42,13 +44,15 @@ module Stalking
 
             return true
           rescue Beanstalk::NotConnected, Timeout::Error, StandardError => e
-            log_error e
+            @logger.andand.error e.message
           end
         rescue Timeout::Error, StandardError => e
-          log_error e
+          @logger.andand.error e.message
         end
       end
 
+      @logger.andand.error "Enqueue #{name.inspect} with #{args.inspect} and #{options.inspect} failed"
+
       # All servers are currently unavailable.
       # Enqueuing the job has failed.
 
@@ -65,10 +69,6 @@ module Stalking
       connection.use name
       connection.put [name, args].to_json, pri, delay, ttr
     end
-
-    def log_error(e)
-      @logger.error("Stalking error: #{e.message}") if @logger
-    end
   end
 end
 

data/lib/stalking/version.rb

@@ -1,3 +1,3 @@
 module Stalking
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/stalking.rb

@@ -2,6 +2,7 @@
 require "stalking/version"
 require "beanstalk-client"
 require "timeout"
+require "andand"
 require "json"
 
 require "stalking/handlers"

data/stalking.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "beanstalk-client"
   s.add_dependency "json_pure"
+  s.add_dependency "andand"
 end
 

data/test/stalking/consumer_test.rb

@@ -199,7 +199,7 @@ class Stalking::ConsumerTest < Test::Unit::TestCase
 
     assert_equal [["down"], ["test", { "a" => "b" }]], res
 
-    assert_equal ["Stalking error: Beanstalk::NotConnected"], logger.messages
+    assert_equal ["Beanstalk::NotConnected"], logger.messages
   end
 
   def test_logger

data/test/stalking/producer_test.rb

@@ -80,7 +80,7 @@ class Stalking::ProducerTest < Test::Unit::TestCase
 
     producer.enqueue "test", "up" => "true"
 
-    assert_equal ["Stalking error: Beanstalk::NotConnected"], logger.messages
+    assert_equal ['Enqueue "test" with {"up"=>"true"} and {}', "Beanstalk::NotConnected", 'Enqueue "test" with {"up"=>"true"} and {} failed'], logger.messages
   end
 end
 

data/test/stalking/test_logger.rb

@@ -6,6 +6,10 @@ class TestLogger
     @messages = []
   end
 
+  def info(msg)
+    @messages.push msg
+  end
+
   def error(msg)
     @messages.push msg
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stalking
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: andand
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Asynchronous job processing using the beanstalkd queue server with automatic
   reconnects and failover
 email: