anschel 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4788b6213db1bd12665c8013ac0febdf050c4fa
-  data.tar.gz: a5aeac6a4793ac4f8dfb462c806bb0ea5c071ad1
+  metadata.gz: bbe6eb2c7595931308ffa51a7c5c246d70bc0bd2
+  data.tar.gz: c982d14ef5c18395f19dea1803875ee81dce3377
 SHA512:
-  metadata.gz: 7590527e3cab6ebd0376600052a0ad4af8c2316f422da61f088d38fd6420fd2f2713ec9f44e8ca905a44ab2f10f4f2459b5bd14dd2c440ae568d6904be35eb60
-  data.tar.gz: d3f92b3da36d68f3114bac609f1446f5eaddc07982f89a89f7ba2d699ec69ff6fd4a9b2412f6ea924bcf601676cfbbbdeebeb8a402a2aec6b9a142488317f0ad
+  metadata.gz: a7664952bdf55874f8f883dead99b346034d565462d11e37246ce9437f0d730721eb1726333e492731f159bae02779c5cdbbeaeea80655135fe51ef7a49b6841
+  data.tar.gz: 9dccba8d5cd9cef7ce7e841c95a224807a297091503a9eef98787e75f9d22fbd751149638bca0e0af93ac6d4b4d2f77bb23ec37a0186bfc389e10e9f5bd2f083

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/lib/anschel/input/kafka.rb

@@ -6,9 +6,9 @@ require_relative 'base'
 module Anschel
   class Input
     class Kafka < Base
-      def initialize queue, config, stats, log
+      def initialize output, config, stats, log
         @consumer_group = ::Kafka::Group.new config
-        @consumer_group.run num_cpus, queue
+        @consumer_group.run num_cpus, output
       end
 
       def stop

data/lib/anschel/input/rabbitmq.rb

@@ -6,31 +6,43 @@ require_relative 'base'
 module Anschel
   class Input
     class RabbitMQ < Base
-      def initialize queue, config, stats, log
-        default_exchange = {
+      def initialize output, config, stats, log
+        exchange_defaults = {
           type: 'x-consistent-hash',
           durable: true
         }
 
-        default_qconf = {
+        queue_defaults = {
           exclusive: false,
           auto_delete: false,
           durable: true
         }
 
+        subscription_defaults = {
+          block: true,
+          ack: true
+        }
+
         exchange_name = config[:exchange].delete(:name)
 
-        @threads = config[:queues].map do |qname, qconf|
+        @threads = config[:queues].map do |queue_name, queue_config|
           Thread.new do
-            conn = ::MarchHare.connect config[:connection]
-            chan = conn.create_channel
+            connection = ::MarchHare.connect config[:connection]
+
+            channel = connection.create_channel
+
+            exchange = channel.exchange exchange_name, \
+              exchange_defaults.merge(config[:exchange])
+
+            queue = channel.queue queue_name.to_s, \
+              queue_defaults.merge(queue_config)
 
-            exchange = chan.exchange exchange_name, \
-              default_exchange.merge(config[:exchange])
+            subscription = subscription_defaults.merge \
+              (config[:subscription] || {})
 
-            rmq = chan.queue qname.to_s, default_qconf.merge(qconf)
-            rmq.subscribe(block: true) do |_, message|
-              queue << message
+            queue.subscribe(subscription) do |meta, message|
+              output << message
+              channel.ack meta.delivery_tag, false if subscription[:ack]
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anschel
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -165,3 +165,4 @@ signing_key:
 specification_version: 4
 summary: Logstash-like for moving events from Kafka into Elasticsearch
 test_files: []
+has_rdoc: