rabbit-wq 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc6f0e1818ec8018d83f187a1b893286577dfc5
-  data.tar.gz: 7e09ea7946c1079478c86021062cdda8bcb18773
+  metadata.gz: f8e86ae9f34e0920dceda5699c13b63363a82d38
+  data.tar.gz: 6af20f31ad5f3a8f4cded189d805f74df5e81fb5
 SHA512:
-  metadata.gz: ce94b748c73d75c32e5ae2456d34e25a5e6139840604d9c2cf0760d3f8e7c4814832f83399e26bf6eee91e7574c5c006f3226f8c92daef83a8e85e21ff7f6c36
-  data.tar.gz: 8168b5fcaac9210163bb0bc58a32bf8fa6365e4e1fd1009c0cd19d38f2190f577bd0f457875761a9aae398d4a2e263c0a1a2e3c4f891273176cb91956991aa2f
+  metadata.gz: 448e60e96a6bd5a3f578ffe70312fc013d913dead47bcb203b652b37580f50735278b33076cd48900631b0fd27bc706ffab4147b6655a5923ee1c26477b637a8
+  data.tar.gz: b62f2e1b0e71089eb1129de9abf010e86c73e8ef8353e866af423a96ed0ee4e6b4e90c980968930ce36832c76a5205777bcb3a6a9e19ac0180ceba3d66620d5e

data/README.md

@@ -138,6 +138,13 @@ do not have to provide a refrence to self in this case.
 
 The RabbitWQ loggers provide the following log levels: debug, info, warn, error and fatal.
 
+### Work Publish vs. Subscribe Queue
+
+Quite often the work publish and subscribe queues are the same queue.  However, certain use cases require a seprarate work publish
+and subscribe queue.  For instance, when you use te RabbitMQ shovel plugin to effectively create a distributed queue, you may want 
+to publish to a local queue that is shoveled to a central work queue, where the subscriber resides and performs the actual work.
+
+
 ### Configuration File
 
 The RabbitWQ configuration file uses JSON syntax.  The default location for the configuration file is /var/run/rabbit-wq/rabbit-wq.conf
@@ -156,7 +163,8 @@ Here is an example configuration file with each option's default value:
       "work_exchange_type": "fanout",
       "work_log_level": "info",
       "work_log_path": "/var/log/rabbit-wq/rabbit-wq-work.log",
-      "work_queue": "work"
+      "work_publish_queue": "work"
+      "work_subscribe_queue": "work"
     }
 
 #### Options
@@ -194,8 +202,11 @@ The log level of the worker logger.  Defaults to info.
 #####work_log_path
 The path the worker logger will log to. Defaults to /var/log/rabbit-wq/rabbit-wq-work.log.
 
-#####work_queue
-The name of the work queue.  Defaults to work.
+#####work_publish_queue
+The name of the work queue to publish to.  Defaults to work.
+
+#####work_subscribe_queue
+The name of the work queue to subscribe to.  Defaults to work.
 
 
 ### Command Line Interface

data/lib/rabbit_wq/configuration.rb

@@ -16,7 +16,8 @@ module RabbitWQ
         work_exchange_type
         work_log_level
         work_log_path
-        work_queue
+        work_publish_queue
+        work_subscribe_queue
       )
     end
 
@@ -69,9 +70,14 @@ module RabbitWQ
       @work_log_path || '/var/log/rabbit-wq/rabbit-wq-work.log'
     end
 
-    def work_queue
-      @work_queue || 'work'
+    def work_publish_queue
+      @work_publish_queue || 'work'
+    end
+
+    def work_subscribe_queue
+      @work_subscribe_queue || 'work'
     end
 
   end
+
 end

data/lib/rabbit_wq/queues.rb

@@ -15,15 +15,5 @@ module RabbitWQ
       end
     end
 
-    #def work_exchange
-      #@work_exchange ||= channel.direct( RabbitWQ.configuration.work_exchange, durable: true )
-    #end
-
-    #def work_queue
-      #@work_queue ||= channel.queue( RabbitWQ.configuration.work_queue,
-                                     #durable: true ).
-                              #bind( work_exchange )
-    #end
-
   end
 end

data/lib/rabbit_wq/server.rb

@@ -39,10 +39,10 @@ module RabbitWQ
                                        config.work_exchange, durable: true )
     end
 
-    def work_queue
-      @work_queue ||= channel.queue( config.work_queue,
-                                     durable: true ).
-                              bind( work_exchange )
+    def work_subscribe_queue
+      @work_subscribe_queue ||= channel.queue( config.work_subscribe_queue,
+                                               durable: true ).
+                                        bind( work_exchange )
     end
 
     def pool
@@ -54,7 +54,7 @@ module RabbitWQ
         Celluloid::Actor[:message_handler] = MessageHandler.new
       end
 
-      @work_consumer = work_queue.subscribe( manual_ack: true ) do |delivery_info, metadata, payload|
+      @work_consumer = work_subscribe_queue.subscribe( manual_ack: true ) do |delivery_info, metadata, payload|
         info "LISTENER RECEIVED #{payload}"
 
         if threads > 1

data/lib/rabbit_wq/version.rb

@@ -1,3 +1,3 @@
 module RabbitWQ
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/rabbit_wq/work.rb

@@ -3,6 +3,8 @@ require 'bunny'
 module RabbitWQ
   module Work
 
+    YAML_MIMETYPE = 'application/yaml'
+
     def self.enqueue( worker, options={} )
       payload = worker.to_yaml
       enqueue_payload( payload, options )
@@ -14,38 +16,38 @@ module RabbitWQ
 
       if delay
         with_channel do |channel|
-          delay_x = channel.direct( "#{RabbitWQ.configuration.delayed_exchange_prefix}-#{delay}ms", durable: true )
+          delay_x = channel.direct( "#{config.delayed_exchange_prefix}-#{delay}ms", durable: true )
 
-          work_x = channel.send( RabbitWQ.configuration.work_exchange_type,
-                                 RabbitWQ.configuration.work_exchange,
+          work_x = channel.send( config.work_exchange_type,
+                                 config.work_exchange,
                                  durable: true )
 
-          channel.queue( "#{RabbitWQ.configuration.delayed_queue_prefix}-#{delay}ms",
+          channel.queue( "#{config.delayed_queue_prefix}-#{delay}ms",
                          durable: true,
                          arguments: { "x-dead-letter-exchange" => work_x.name,
                                       "x-message-ttl" => delay } ).
                   bind( delay_x )
 
           delay_x.publish( payload, durable: true,
-                                    content_type: 'application/yaml',
+                                    content_type: YAML_MIMETYPE,
                                     headers: options )
         end
 
         return
       end
 
-      with_work_exchange do |work_x, work_q|
-        work_x.publish( payload, durable: true,
-                                 content_type: 'application/yaml',
-                                 headers: options )
+      with_work_exchange do |work_x, work_pub_q, work_sub_q|
+        work_pub_q.publish( payload, durable: true,
+                                     content_type: YAML_MIMETYPE,
+                                     headers: options )
       end
     end
 
     def self.enqueue_error_payload( payload, options={} )
       with_channel do |channel|
-        error_q = channel.queue( RabbitWQ.configuration.error_queue, durable: true )
+        error_q = channel.queue( config.error_queue, durable: true )
         error_q.publish( payload, durable: true,
-                                  content_type: 'application/yaml',
+                                  content_type: YAML_MIMETYPE,
                                   headers: options )
       end
     end
@@ -53,14 +55,15 @@ module RabbitWQ
     def self.with_work_exchange
       with_channel do |channel|
         begin
-          exchange = channel.send( RabbitWQ.configuration.work_exchange_type,
-                                   RabbitWQ.configuration.work_exchange,
+          exchange = channel.send( config.work_exchange_type,
+                                   config.work_exchange,
                                    durable: true )
 
-          channel.queue( RabbitWQ.configuration.work_queue, durable: true ).tap do |q|
-            q.bind( exchange )
-            yield exchange, q
-          end
+          work_pub_q = channel.queue( config.work_publish_queue, durable: true )
+          work_sub_q = channel.queue( config.work_subscribe_queue, durable: true )
+          work_sub_q.bind( exchange )
+
+          yield exchange, work_pub_q, work_sub_q
         ensure
         end
       end
@@ -79,19 +82,9 @@ module RabbitWQ
       end
     end
 
-    #def self.with_exchange
-      #Bunny.new.tap do |b|
-        #b.start
-        #begin
-          #b.create_channel.tap do |c|
-            #queue = c.queue( 'replication', durable: true )
-            #yield c.default_exchange, queue.name
-          #end
-        #ensure
-          #b.stop
-        #end
-      #end
-    #end
+    def self.config
+      RabbitWQ.configuration
+    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit-wq
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - C. Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler