qu-mongo 0.1.0 → 0.1.1

data/lib/qu/backend/mongo.rb

@@ -22,7 +22,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}"
           jobs(q).drop
           self[:queues].remove({:name => q})
         end
@@ -36,54 +38,66 @@ module Qu
         jobs(queue).count
       end
 
-      def enqueue(klass, *args)
-        job = Qu::Job.new(BSON::ObjectId.new, klass, args)
-        jobs(job.queue).insert({:_id => job.id, :class => job.klass.to_s, :args => job.args})
-        self[:queues].update({:name => job.queue}, {:name => job.queue}, :upsert => true)
-        job
+      def enqueue(payload)
+        payload.id = BSON::ObjectId.new
+        jobs(payload.queue).insert({:_id => payload.id, :klass => payload.klass.to_s, :args => payload.args})
+        self[:queues].update({:name => payload.queue}, {:name => payload.queue}, :upsert => true)
+        logger.debug { "Enqueued job #{payload}" }
+        payload
       end
 
       def reserve(worker, options = {:block => true})
-        worker.queues.each do |queue|
-          begin
-            doc = jobs(queue).find_and_modify(:remove => true)
-            return Job.new(doc['_id'], doc['class'], doc['args'])
-          rescue ::Mongo::OperationFailure
-            # No jobs in the queue
+        loop do
+          worker.queues.each do |queue|
+            logger.debug { "Reserving job in queue #{queue}" }
+
+            begin
+              if doc = jobs(queue).find_and_modify(:remove => true)
+                doc['id'] = doc.delete('_id')
+                return Payload.new(doc)
+              end
+            rescue ::Mongo::OperationFailure
+              # No jobs in the queue (MongoDB <2)
+            end
           end
-        end
 
-        if options[:block]
-          sleep 5
-          retry
+          if options[:block]
+            sleep 5
+          else
+            break
+          end
         end
       end
 
-      def release(job)
-        jobs(job.queue).insert({:_id => job.id, :class => job.klass.to_s, :args => job.args})
+      def release(payload)
+        jobs(payload.queue).insert({:_id => payload.id, :klass => payload.klass.to_s, :args => payload.args})
       end
 
-      def failed(job, error)
-        jobs('failed').insert(:_id => job.id, :class => job.klass.to_s, :args => job.args, :queue => job.queue)
+      def failed(payload, error)
+        jobs('failed').insert(:_id => payload.id, :klass => payload.klass.to_s, :args => payload.args, :queue => payload.queue)
       end
 
-      def completed(job)
+      def completed(payload)
       end
 
       def requeue(id)
-        doc = jobs('failed').find_and_modify(:query => {:_id => id}, :remove => true)
+        logger.debug "Requeuing job #{id}"
+        doc = jobs('failed').find_and_modify(:query => {:_id => id}, :remove => true) || raise(::Mongo::OperationFailure)
         jobs(doc.delete('queue')).insert(doc)
-        Job.new(doc['_id'], doc['class'], doc['args'])
+        doc['id'] = doc.delete('_id')
+        Payload.new(doc)
       rescue ::Mongo::OperationFailure
         false
       end
 
       def register_worker(worker)
+        logger.debug "Registering worker #{worker.id}"
         self[:workers].insert(worker.attributes.merge(:id => worker.id))
       end
 
-      def unregister_worker(id)
-        self[:workers].remove(:id => id)
+      def unregister_worker(worker)
+        logger.debug "Unregistering worker #{worker.id}"
+        self[:workers].remove(:id => worker.id)
       end
 
       def workers
@@ -93,6 +107,7 @@ module Qu
       end
 
       def clear_workers
+        logger.info "Clearing workers"
         self[:workers].drop
       end
 

metadata

@@ -1,112 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qu-mongo
-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: mongo
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70308629358020 !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: qu
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70308629358020
+- !ruby/object:Gem::Dependency
+  name: qu
+  requirement: &70308629357540 !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: *id002
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70308629357540
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &70308629357160 !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: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70308629357160
 description: Mongo backend for qu
-email: 
+email:
 - brandon@opensoul.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/qu-mongo.rb
 - lib/qu/backend/mongo.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: Mongo backend for qu
 test_files: []
-