anschel 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d32db0a5fe08817a91ac24c3d3e4cc57b53ce01
-  data.tar.gz: 4df5ae73011b3c6a8952b6c6366007f24241e842
+  metadata.gz: cdf130bb128d999dc9450067c9633f83d9526c38
+  data.tar.gz: 23e6e0352befe82127788fee394d833dcc2abbe7
 SHA512:
-  metadata.gz: 73111befe962052809308f788bbb2ccf306992fbc0cbc2360f65c6ee107002c75e473768f8c970b211ee219d189671b72c8c1d0892c23c5f14fe66f384b1c41f
-  data.tar.gz: 1ee9dca9c94e851293b68beeff95221453245095cc81c636e570bad128e3d6510cbf9c17d02093a5f214e8dad2ded951ee2e383f199f2bd84fe11935e6a371e4
+  metadata.gz: 9c699d8b18cf952003b5623dc070bff72a8104dbcea3742e4f8322c149c953a00be2006338aef9c664266b1e3aee94d1168535791077a0d02718e91f25e631a3
+  data.tar.gz: bed1c3540726189cc64ce303d26ff46671da086323e7e13cb942cdecd631ee4003e49fa582931ed3de647462743aa3ecee6ac2323b0076715dae0cc695d319f1

data/VERSION

@@ -1 +1 @@
-0.7.10
+0.7.11

data/lib/anschel/input/rabbitmq.rb

@@ -7,7 +7,11 @@ module Anschel
   class Input
     class RabbitMQ < Base
       def initialize output, config, stats, log
-        connection_defaults = {}
+        connection_defaults = {
+          heartbeat_interval: 30,
+          connection_timeout: 10,
+          automatically_recover: false
+        }
 
         exchange_defaults = {
           type: 'x-consistent-hash',
@@ -29,11 +33,14 @@ module Anschel
         connection = ::MarchHare.connect \
           connection_defaults.merge(config[:connection] || {})
 
+        handle_errors connection, log
+
         exchange_name = config[:exchange].delete(:name)
 
         @threads = config[:queues].map do |queue_name, queue_config|
           Thread.new do
             channel = connection.create_channel
+            channel.prefetch = config[:prefetch] || 256
 
             exchange = channel.exchange exchange_name, \
               exchange_defaults.merge(config[:exchange])
@@ -62,6 +69,47 @@ module Anschel
         @threads.map(&:kill)
         @stopped = true
       end
+
+    private
+
+      # Ensure broker errors results in logs and exits appropriately. Seems like
+      # the March Hare is catching exceptions under the hood, so we can't just
+      # raise within these callbacks, and we're stuck with this jankiness
+      def handle_errors connection, log
+        shutdown = false
+        blocked  = false
+
+        connection.on_blocked { |reason| blocked = reason }
+
+        connection.on_unblocked { blocked = nil }
+
+        connection.on_shutdown { |_, reason| shutdown = reason }
+
+        Thread.new do
+          loop do
+            sleep 1
+
+            if shutdown
+              log.fatal \
+                event: 'input-rabbitmq-shutdown',
+                reason: shutdown
+              raise RuntimeError
+            end
+
+            if blocked
+              log.warn \
+                event: 'input-rabbitmq-blocked',
+                reason: blocked
+
+            elsif blocked.nil?
+              log.warn \
+                event: 'input-rabbitmq-unblocked'
+            end
+
+            blocked = false
+          end
+        end
+      end
     end
   end
 end

data/lib/anschel/main.rb

@@ -85,8 +85,6 @@ module Anschel
           end
         end
 
-        ts.each { |t| t.abort_on_exception = true }
-
       rescue Exception => e
         log.fatal \
           event: 'exception',

data/lib/anschel/output/device.rb

@@ -15,6 +15,7 @@ module Anschel
           File.open(path, 'w') do |f|
             loop do
               f.puts @queue.shift
+              f.flush
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anschel
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.15'
   name: march_hare
   prerelease: false
   type: :runtime
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: