diff --git a/lib/queue_classic.rb b/lib/queue_classic.rb index 04f8931d..80c4b056 100644 --- a/lib/queue_classic.rb +++ b/lib/queue_classic.rb @@ -1,12 +1,3 @@ -require "pg" -require "uri" -require "json" - -require "queue_classic/conn" -require "queue_classic/queue" -require "queue_classic/worker" -require "queue_classic/setup" - module QC Root = File.expand_path("..", File.dirname(__FILE__)) SqlFunctions = File.join(QC::Root, "/sql/ddl.sql") @@ -93,3 +84,7 @@ def self.log(data) return result end end + +require "queue_classic/queue" +require "queue_classic/worker" +require "queue_classic/setup" diff --git a/lib/queue_classic/conn.rb b/lib/queue_classic/conn.rb index 72883407..8120dd2a 100644 --- a/lib/queue_classic/conn.rb +++ b/lib/queue_classic/conn.rb @@ -1,4 +1,6 @@ require 'thread' +require 'uri' +require 'pg' module QC module Conn diff --git a/lib/queue_classic/queue.rb b/lib/queue_classic/queue.rb index e3a00d2f..e3490c4e 100644 --- a/lib/queue_classic/queue.rb +++ b/lib/queue_classic/queue.rb @@ -1,3 +1,7 @@ +require 'queue_classic' +require 'queue_classic/conn' +require 'json' + module QC class Queue diff --git a/lib/queue_classic/worker.rb b/lib/queue_classic/worker.rb index 8cdab02a..32d84fea 100644 --- a/lib/queue_classic/worker.rb +++ b/lib/queue_classic/worker.rb @@ -1,3 +1,7 @@ +require 'queue_classic' +require 'queue_classic/queue' +require 'queue_classic/conn' + module QC class Worker @@ -6,7 +10,7 @@ class Worker # the defaults are pulled from the environment variables. def initialize(args={}) @fork_worker = args[:fork_worker] || QC::FORK_WORKER - @queue = Queue.new((args[:q_name] || QC::QUEUE), args[:top_bound]) + @queue = QC::Queue.new((args[:q_name] || QC::QUEUE), args[:top_bound]) log(args.merge(:at => "worker_initialized")) @running = true end