queue_classic 0.3.1 → 0.3.2

data/lib/queue_classic/database.rb

@@ -1,5 +1,6 @@
 module QC
   class Database
+    @@connection = nil
 
     MAX_TOP_BOUND = 9
     DEFAULT_QUEUE_NAME = "queue_classic_jobs"
@@ -43,24 +44,25 @@ module QC
 
     def disconnect
       connection.finish
+      @@connection = nil
     end
 
     def connection
-      if defined? @connection
-        @connection
-      else
+      unless @@connection
         @name = @db_params.path.gsub("/","")
-        @connection = PGconn.connect(
-          :dbname   => @db_params.path.gsub("/",""),
-          :user     => @db_params.user,
-          :password => @db_params.password,
-          :host     => @db_params.host
+        @@connection = PGconn.connect(
+          @db_params.host,
+          @db_params.port || 5432,
+          nil, '',
+          @name,
+          @db_params.user,
+          @db_params.password
         )
-        @connection.exec("LISTEN queue_classic_jobs")
-        @connection.exec("SET application_name = 'queue_classic'")
+        @@connection.exec("LISTEN queue_classic_jobs")
+        @@connection.exec("SET application_name = 'queue_classic'")
         silence_warnings unless ENV["LOGGING_ENABLED"]
-        @connection
       end
+      @@connection
     end
 
     def drop_table
@@ -85,9 +87,12 @@ module QC
           relative_top integer;
           job_count integer;
         BEGIN
+          -- The purpose is to release contention for the first spot in the table.
+          -- The select count(*) is going to slow down dequeue performance but allow
+          -- for more workers. Would love to see some optimization here...
+
           SELECT TRUNC(random() * #{@top_boundry} + 1) INTO relative_top;
           EXECUTE 'SELECT count(*) FROM' || tname || '' INTO job_count;
-
           IF job_count < 10 THEN
             relative_top = 0;
           END IF;
@@ -109,7 +114,6 @@ module QC
             END;
           END LOOP;
 
-
           RETURN QUERY EXECUTE 'UPDATE '
             || tname::regclass
             || ' SET locked_at = (CURRENT_TIMESTAMP)'

data/readme.md

@@ -1,33 +1,54 @@
 # Queue Classic
-__Beta 0.3.1__
+__0.3.2__ (beta)
 
-__Queue Classic 0.3.1 is in Beta.__ I have been using this library with 30-150 Heroku workers and have had great results.
+Queue Classic is a postgres-backed queueing library that is focused on
+concurrent job locking, minimizing database load & providing a simple &
+intuitive user experience.
 
-I am using this in production applications and plan to maintain and support this library for a long time.
+Queue Classic Features:
 
-Queue Classic is a queueing library for Ruby apps (Rails, Sinatra, Etc...) Queue Classic features a blocking dequeue, database maintained locks and
-no ridiculous dependencies. As a matter of fact, Queue Classic only requires the __pg__ and __json__.
+* Support for multiple queues with heterogeneous workers
+* Utilization of  Postgres' PUB/SUB
+* JSON encoding for jobs
+* Postgres' rock-solid locking mechanism
+* Long term support
 
-[Discussion Group](http://groups.google.com/group/queue_classic)
+## Quick Start
 
-[Wiki](https://github.com/ryandotsmith/queue_classic/wiki)
+See doc/installation.md for Rails instructions
 
-## Installation
+    $ gem install queue_classic
+    psql=# CREATE TABLE queue_classic_jobs (id serial, details text, locked_at timestamp);
+    psql=# CREATE INDEX queue_classic_jobs_id_idx ON queue_classic_jobs (id);
+    $ rake qc:load_functions
+    irb: QC.enqueue "Class.method", "arg"
+    $ rake jobs:work
 
-1. $ gem install queue_classic
-2. psql=# CREATE TABLE queue_classic_jobs (id serial, details text, locked_at timestamp);
-3. psql=# CREATE INDEX queue_classic_jobs_id_idx ON queue_classic_jobs (id);
-4. $ rake qc:load_functions
-5. irb: QC.enqueue "Class.method", "arg"
-6. $ rake jobs:work
+## Hacking on Queue Classic
 
-### Upgrade from < 0.2.3 to 0.3.0
+### Dependencies
 
-  $ psql your_database
-  your_database=# ALTER TABLE jobs RENAME TO queue_classic_jobs;
+* Postgres version 9
+* Ruby
+* Gems: pg, json
 
-### Dependencies
+### Running Tests
+
+* Install dependencies: pg, json (see gemspec)
+* createdb queue_classic_test
+* export DATABASE_URL="postgres://username:pass@localhost/queue_classic_test"
+* rake will run the tests (or turn test/)
+
+### Building Documentation
+
+If you are adding new features, please document them in the doc directory. Also,
+once you have the markdown in place, please run: ruby doc/build.rb to make HTML
+for the docs.
+
+## Other Resources
+
+###[Documentation](https://github.com/ryandotsmith/queue_classic/tree/master/doc)
 
-  Postgres version 9
+###[Example Rails App](https://github.com/ryandotsmith/queue_classic_example)
 
-  Ruby (gems: pg, json)
+###[Discussion Group](http://groups.google.com/group/queue_classic "discussion group")

data/test/durable_array_test.rb

@@ -70,14 +70,6 @@ context "DurableArray" do
     assert_equal([{"job" => "one"},{"job" => "two"}], results)
   end
 
-  test "connection build db connection from uri" do
-    a = QC::Database.new("postgres://ryandotsmith:@localhost/queue_classic_test")
-    assert_equal "ryandotsmith", a.connection.user
-    assert_equal "localhost", a.connection.host
-    assert_equal "queue_classic_test", a.connection.db
-    a.disconnect
-  end
-
   test "seach" do
     @array << {"job" => "A.signature"}
     jobs = @array.search_details_column("A.signature")

data/test/helper.rb

@@ -1,6 +1,8 @@
 $: << File.expand_path("lib")
 $: << File.expand_path("test")
 
+ENV['DATABASE_URL'] ||= 'postgres:///queue_classic_test'
+
 require 'queue_classic'
 require 'database_helpers'
 

data/test/worker_test.rb

@@ -42,4 +42,10 @@ context "Worker" do
     @worker.work
     assert_equal 1, @worker.failed_count
   end
+
+  test "only makes one connection" do
+    QC.enqueue "TestNotifier.deliver", {}
+    @worker.work
+    assert_equal 1, QC.connection_status[:total]
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: queue_classic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ryan Smith
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-08-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency