queueing_proxy 0.0.6 → 0.0.7

data/bin/queueing_proxy

@@ -9,7 +9,7 @@ EM.run{
   QueueingProxy {
     logger Logger.new($stdout)
 
-    from '0.0.0.0', 11000
+    from '0.0.0.0', 10000
     from '0.0.0.0', 10007
 
     to '127.0.0.1', 10001, do
@@ -26,7 +26,7 @@ EM.run{
   QueueingProxy {
     logger Logger.new($stdout)
 
-    from '0.0.0.0', 10002
+    from '0.0.0.0', 10009
 
     to('127.0.0.1', 10001) do
       workers 1

data/lib/queueing_proxy/dsl.rb

@@ -3,7 +3,7 @@ require 'logger'
 module QueueingProxy
   class DSL
     class Backend
-      attr_reader :tube, :host
+      attr_reader :tube, :host, :beanstalk_host
 
       def initialize(host='localhost', port=80, workers=4, &block)
         @host, @port, @workers, @beanstalk_host, @tube = host, port, workers, 'localhost', 'default'
@@ -11,8 +11,8 @@ module QueueingProxy
         self
       end
 
-      def queue_with(beanstalk, tube)
-        @beanstalk, @tube = beanstalk, tube
+      def queue_with(beanstalkd_host, tube)
+        @beanstalk_host, @tube = beanstalkd_host, tube
         self
       end
 
@@ -55,14 +55,14 @@ module QueueingProxy
       unless EM.reactor_running?
         EM.run{ run }
       else
-        frontends.each do |host, port|
-          Frontend.new(@logger, host, port, backends).run
-        end
         # Setup multiple backends
         backends.each {|b|
           b.logger @logger
-          b.workers.each(&:run) 
+          b.workers.each(&:run)
         }
+        frontends.each do |host, port|
+          Frontend.new(@logger, host, port, backends).run
+        end
       end
     end
 

data/lib/queueing_proxy/frontend.rb

@@ -4,12 +4,12 @@ module QueueingProxy
 
     def initialize(logger, host, port, backends)
       @logger, @host, @port, @backends = logger, host, port, backends
-      logger.info "Starting queuer on #{host}:#{port} using beanstalk at #{backends.map{|b| "#{b.tube}@#{b.host}"}.join(', ')}"
+      logger.info "Frontend reporting for duty at #{host}:#{port}. Connected to backend(s) through #{backends.map{|b| "#{b.tube}@#{b.beanstalk_host}"}.join(', ')}"
     end
 
     def beanstalks
       @beanstalks ||= @backends.map {|b|
-        connection = EMJack::Connection.new(:host => b.host, :tube => b.tube)
+        connection = EMJack::Connection.new(:host => b.beanstalk_host, :tube => b.tube)
         connection.errback { logger.error "Couldn't connect to beanstalk" }
         connection
       }

data/lib/queueing_proxy/version.rb

@@ -1,3 +1,3 @@
 module QueueingProxy
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/queueing_proxy/worker.rb

@@ -23,7 +23,7 @@ module QueueingProxy
     # Run the beanstalk consumer that pops the job off the queue and passes it 
     # to a connection object that makes an upstream connection
     def run
-      logger.debug "Worker #{object_id} reporting again for duty"
+      logger.debug "Worker #{@tube}@#{@beanstalk_host} #{object_id} reporting again for duty"
       beanstalk.reserve {|job|
         logger.info "Worker #{object_id} reserved #{job}"
         upstream = Upstream.new(job.body, @to_host, @to_port, 15, logger).request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queueing_proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70314864929920 !ruby/object:Gem::Requirement
+  requirement: &70205884493120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314864929920
+  version_requirements: *70205884493120
 - !ruby/object:Gem::Dependency
   name: em-jack
-  requirement: &70314864928500 !ruby/object:Gem::Requirement
+  requirement: &70205884492040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314864928500
+  version_requirements: *70205884492040
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70314864928020 !ruby/object:Gem::Requirement
+  requirement: &70205884491620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314864928020
+  version_requirements: *70205884491620
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70314864927480 !ruby/object:Gem::Requirement
+  requirement: &70205884491160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314864927480
+  version_requirements: *70205884491160
 description: Queueing proxy backed by EM/Beanstalk for a very weird purpose.
 email: joshbuddy@gmail.com
 executables: