queue_classic 0.1.5 → 0.1.6

data/lib/notifier.rb

@@ -0,0 +1,5 @@
+class Notifier
+  def self.deliver(msg)
+  `say #{msg}`
+  end
+end

data/lib/queue_classic/api.rb

@@ -28,5 +28,9 @@ module QC
       puts "ArgumentError: #{e.inspect}"
     end
 
+    def logging_enabled?
+      true
+    end
+
   end
 end

data/lib/queue_classic/durable_array.rb

@@ -34,15 +34,11 @@ module QC
       @db_string  = args[:database]
       @connection = connection
       execute("SET client_min_messages TO 'warning'")
-      execute("LISTEN jobs")
+      with_log("setup PG LISTEN") { execute("LISTEN jobs") }
     end
 
     def <<(details)
-      execute(
-        "INSERT INTO jobs" +
-        "(details)" +
-        "VALUES ('#{details.to_json}')"
-      )
+      execute("INSERT INTO jobs (details) VALUES ('#{details.to_json}')")
       execute("NOTIFY jobs, 'new-job'")
     end
 
@@ -51,7 +47,7 @@ module QC
     end
 
     def delete(job)
-      execute("DELETE FROM jobs WHERE id = #{job.id}")
+      with_log("deleting job #{job.id}") { execute("DELETE FROM jobs WHERE id = #{job.id}") }
       job
     end
 
@@ -66,10 +62,14 @@ module QC
 
     def lock_head
       job = nil
-      @connection.transaction do
-        job = find_one {"SELECT * FROM jobs WHERE locked_at IS NULL ORDER BY id ASC LIMIT 1 FOR UPDATE"}
-        return nil unless job
-        locked  = execute("UPDATE jobs SET locked_at = (CURRENT_TIMESTAMP) WHERE id = #{job.id} AND locked_at IS NULL")
+      with_log("start lock transaction") do
+        @connection.transaction do
+          if job = find_one {"SELECT * FROM jobs WHERE locked_at IS NULL ORDER BY id ASC LIMIT 1 FOR UPDATE"}
+            with_log("lock acquired for #{job.inspect}") do
+              execute("UPDATE jobs SET locked_at = (CURRENT_TIMESTAMP) WHERE id = #{job.id} AND locked_at IS NULL")
+            end
+          end
+        end
       end
       job
     end
@@ -95,7 +95,7 @@ module QC
 
     def find_one
       res = execute(yield)
-      if res.cmd_tuples > 0
+      if res.count > 0
         res.map do |r|
           Job.new(
             "id"        => r["id"],
@@ -120,5 +120,19 @@ module QC
       end
     end
 
+    def with_log(msg)
+      res = yield
+      if QC.logging_enabled?
+        log(msg)
+        log(res.cmd_status)           if res.respond_to?(:cmd_status)
+        log(res.result_error_message) if res.respond_to?(:result_error_message)
+      end
+      res
+    end
+
+    def log(msg)
+      puts "| \t" + msg
+    end
+
   end
 end

data/lib/queue_classic.rb

@@ -8,8 +8,8 @@ require 'queue_classic/worker'
 require 'queue_classic/queue'
 require 'queue_classic/api'
 
-QC::Queue.setup :data_store => QC::DurableArray.new(:database => ENV["DATABASE_URL"])
-
 module QC
   extend Api
 end
+
+QC::Queue.setup :data_store => QC::DurableArray.new(:database => ENV["DATABASE_URL"])

data/readme.markdown

@@ -1,7 +1,7 @@
 # Queue Classic
-__Alpha 0.1.5__
+__Alpha 0.1.6__
 
-_Queue Classic 0.1.5 is not ready for production. However, it is under active development and I expect a beta release within the following months._
+_Queue Classic 0.1.6 is not ready for production. However, it is under active development and I expect a beta release within the following months._
 
 Queue Classic is an alternative queueing library for Ruby apps (Rails, Sinatra, Etc...) Queue Classic features __asynchronous__ job polling, database maintained locks and
 no ridiculous dependencies. As a matter of fact, Queue Classic only requires the __pg__ and __json__.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ryan Smith
@@ -27,7 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 10
+        - 1
+        version: 0.10.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -53,6 +55,7 @@ extra_rdoc_files: []
 
 files: 
 - readme.markdown
+- lib/notifier.rb
 - lib/queue_classic/api.rb
 - lib/queue_classic/durable_array.rb
 - lib/queue_classic/queue.rb