beanstalk-worker 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: aeda92f511a8d674977782658312b5786bbf2541
-  data.tar.gz: b4b5ec6a0e021f308d66c128bafcc7ccd6ec2640
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjY1M2U3ZTQyNjdiNTdhNDZhOTZlZGMzZTNjNWY1NTZhMGM5OWUyZg==
+  data.tar.gz: !binary |-
+    YmQ1MjRjZDk3ZTZjZWY2NmJiNDY1ZWVjZmQ1MzAzMjAwOGEzZDc4NA==
 SHA512:
-  metadata.gz: 497af4e17370e32b49d7cf68b0aad849a0d7f56219bf6b3f31997a2c8e2af16d394526aaf93307b85c37577522358abceba6e3ed4d524f8cfc4403f572d195cd
-  data.tar.gz: 3982aae177386d568b4940c7c87601279e241b221b11bb29ad42b01cf4c78c03310e72122eee385d808b6aa5dd4493fb99a9d6420076f3ec7bdbde15836e5131
+  metadata.gz: !binary |-
+    ZTkwZTEzOThhNzNiN2M4ZTg2OTNjMzgyOWU3NzE3MmFkMjIxNDI4MzA1MzIy
+    NDE0YTc2MTc2ZGMwMGI5YmQ4ZDc5Njk0NWIyYzhmNzE0ZjNiYmNiOWMyMzhl
+    YThmMzdkYzM2MGQyNmUyZDQzYWZmZjk2MDMyZjE0NmEzZDg4MTY=
+  data.tar.gz: !binary |-
+    ZDRmOTI1ZGJjNzZlMDBhNGY4MmQ1NmExMWE5OWNhYTk0MTkxYmM4OGMxZTYz
+    ODFlODJjMjBjYzAxYmQ5YzhjYjQ3Mzg0Njk0OGJhNWJlOTE5MGRhYmExNGIy
+    MGRkZGI5ZmJlNjVjMjI4ZDJlMmE3YTA1ZGY1N2I0MTIxOWJmYzU=

data/lib/beanstalk-worker.rb

@@ -2,7 +2,7 @@ $:.unshift File.dirname(__FILE__)
 
 module BeanStalk
   class Worker
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end
 

data/lib/beanstalk-worker/worker.rb

@@ -14,16 +14,10 @@ class BeanStalk::Worker
       end
     end
     @config.merge!(config || {})
-
-    @logger = BeanStalk::Worker::Log
-    @logger.reset!
-    @logger.info("Logging started")
     
     @stats = {
       'received' => 0
     }
-    
-    initialize_beanstalk
   end
   
   def beanstalk
@@ -31,47 +25,55 @@ class BeanStalk::Worker
       @connection = Beanstalk::Pool.new([
         BeanStalk::Worker::Config.beanstalk_uri
       ])
-      @logger.info("Connected to beanstalk")
+      @log.info("Connected to beanstalk")
     end
     @connection
   rescue
-    @logger.error("Could not connect to beanstalk.")
+    @log.error("Could not connect to beanstalk.")
     reconnect
   end
   
+  def initialize_logger
+    @log = Logger.new(@config.log_location)
+    @log.level = Logger.const_get(@config.log_level.upcase)
+    @log.error("Logging started")
+  end
+  
   def initialize_beanstalk    
     beanstalk.watch(@config[:beanstalk][:tube])
     beanstalk.use(@config[:beanstalk][:tube])
     beanstalk.ignore('default')
   rescue
-    @logger.error("Could not connect to beanstalk.")
+    @log.error("Could not connect to beanstalk.")
     reconnect
   end
   
   def reconnect
     @connection = nil
-    @logger.error("Sleeping 30 seconds")
+    @log.error("Sleeping 30 seconds")
     sleep(30)
-    @logger.error("Attempting to reconnect")
+    @log.error("Attempting to reconnect")
     start
   end
   
   def start(received = -1)
+    initialize_logger
+    initialize_beanstalk
     while (received == -1) || (@stats['received'] < received)
       begin
         job = beanstalk.reserve
         
-        @logger.debug("job #{job.inspect}")
-        @logger.debug("job #{job.body.inspect}")
+        @log.debug("job #{job.inspect}")
+        @log.debug("job #{job.body.inspect}")
         
         @stats['received'] += 1
         
         job.delete if work(job)
       rescue Beanstalk::NotConnected => e
-        @logger.error("Beanstalk disconnected")
+        @log.error("Beanstalk disconnected")
         reconnect
       rescue Exception => e
-        @logger.error("Caught exception #{e.to_s}")
+        @log.error("Caught exception #{e.to_s}")
         exit
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalk-worker
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Artem Veremey
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -99,56 +99,56 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -183,28 +183,28 @@ dependencies:
   name: beanstalk-client-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Beanstalkd Worker base class
@@ -243,17 +243,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Beanstalkd Worker base class