qu-redis 0.1.0 → 0.1.1

data/lib/qu/backend/redis.rb

@@ -15,12 +15,13 @@ module Qu
       end
       alias_method :redis, :connection
 
-      def enqueue(klass, *args)
-        job = Job.new(SimpleUUID::UUID.new.to_guid, klass, args)
-        redis.set("job:#{job.id}", encode('class' => job.klass.to_s, 'args' => job.args))
-        redis.rpush("queue:#{job.queue}", job.id)
-        redis.sadd('queues', job.queue)
-        job
+      def enqueue(payload)
+        payload.id = SimpleUUID::UUID.new.to_guid
+        redis.set("job:#{payload.id}", encode('klass' => payload.klass.to_s, 'args' => payload.args))
+        redis.rpush("queue:#{payload.queue}", payload.id)
+        redis.sadd('queues', payload.queue)
+        logger.debug { "Enqueued job #{payload}" }
+        payload
       end
 
       def length(queue = 'default')
@@ -29,7 +30,9 @@ module Qu
 
       def clear(queue = nil)
         queue ||= queues + ['failed']
+        logger.info { "Clearing queues: #{queue.inspect}" }
         Array(queue).each do |q|
+          logger.debug "Clearing queue #{q}"
           redis.srem('queues', q)
           redis.del("queue:#{q}")
         end
@@ -42,6 +45,8 @@ module Qu
       def reserve(worker, options = {:block => true})
         queues = worker.queues.map {|q| "queue:#{q}" }
 
+        logger.debug { "Reserving job in queues #{queues.inspect}"}
+
         if options[:block]
           id = redis.blpop(*queues.push(0))[1]
         else
@@ -51,36 +56,39 @@ module Qu
         get(id) if id
       end
 
-      def release(job)
-        redis.rpush("queue:#{job.queue}", job.id)
+      def release(payload)
+        redis.rpush("queue:#{payload.queue}", payload.id)
       end
 
-      def failed(job, error)
-        redis.rpush("queue:failed", job.id)
+      def failed(payload, error)
+        redis.rpush("queue:failed", payload.id)
       end
 
-      def completed(job)
-        redis.del("job:#{job.id}")
+      def completed(payload)
+        redis.del("job:#{payload.id}")
       end
 
       def requeue(id)
-        if job = get(id)
+        logger.debug "Requeuing job #{id}"
+        if payload = get(id)
           redis.lrem('queue:failed', 1, id)
-          redis.rpush("queue:#{job.queue}", id)
-          job
+          redis.rpush("queue:#{payload.queue}", id)
+          payload
         else
           false
         end
       end
 
       def register_worker(worker)
+        logger.debug "Registering worker #{worker.id}"
         redis.set("worker:#{worker.id}", encode(worker.attributes))
         redis.sadd(:workers, worker.id)
       end
 
-      def unregister_worker(id)
-        redis.del("worker:#{id}")
-        redis.srem('workers', id)
+      def unregister_worker(worker)
+        logger.debug "Unregistering worker #{worker.id}"
+        redis.del("worker:#{worker.id}")
+        redis.srem('workers', worker.id)
       end
 
       def workers
@@ -88,7 +96,9 @@ module Qu
       end
 
       def clear_workers
+        logger.info "Clearing workers"
         while id = redis.spop(:workers)
+          logger.debug "Clearing worker #{id}"
           redis.del("worker:#{id}")
         end
       end
@@ -102,7 +112,7 @@ module Qu
       def get(id)
         if data = redis.get("job:#{id}")
           data = decode(data)
-          Job.new(id, data['class'], data['args'])
+          Payload.new(:id => id, :klass => data['klass'], :args => data['args'])
         end
       end
 

metadata

@@ -1,112 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qu-redis
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-23 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis-namespace
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70323678030260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: simple_uuid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70323678030260
+- !ruby/object:Gem::Dependency
+  name: simple_uuid
+  requirement: &70323678029840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: qu
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70323678029840
+- !ruby/object:Gem::Dependency
+  name: qu
+  requirement: &70323678029360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70323678029360
 description: Redis backend for qu
-email: 
+email:
 - brandon@opensoul.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/qu-redis.rb
 - lib/qu/backend/redis.rb
-has_rdoc: true
 homepage: http://github.com/bkeepers/qu
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Redis backend for qu
 test_files: []
-