mercury_amqp 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8abccdb5190f1e4c7ef3f6da267d4552f79a8046
-  data.tar.gz: 554cd4fb2c1f58b3f42e5087ae40a08f9abfcc47
+  metadata.gz: b38b3dede66b9e8be986f8b8f3fc480e62d326b6
+  data.tar.gz: 4b9b9dc78020adb4eefa32e0ec25b1e846088c41
 SHA512:
-  metadata.gz: 29e7319862aa1d7d2276ff2b5d9611771152bd84f65ed923ffaac7f68bac759f103441145eb43ffcd50a41e4288a754022bf18c18bf70581432340621bae7f0b
-  data.tar.gz: c932237d88e0215185381df655a1711c9fd9af0f7e513a6a0f869ee37ddf2058674ea2aa73923c89d1feb2ec81b2320d4d0f7cd461e6475d42d7772c894ce585
+  metadata.gz: de30e69c5f7d06a9579a28d38f5604038b0227ea0b380541c582107400139862bce47ab59c9be1cc6edd19a2d88533a29a3cb0ff8b26c607f67fe2337fbdc656
+  data.tar.gz: 79ecf41880b13bee8f514aeb9d3aaff18d4b17ad009fdbe336c20a0384ba002db06c99398b9861258f5aef34fe79fa8658d333310f6820f844e8cea6fe01a11a

data/lib/mercury/mercury.rb

@@ -25,12 +25,16 @@ class Mercury
                  username: 'guest',
                  password: 'guest',
                  parallelism: 1,
+                 on_error: nil,
                  &k)
-    AMQP.connect(host: host, port: port, vhost: vhost, username: username, password: password) do |amqp|
+    @on_error = on_error
+    AMQP.connect(host: host, port: port, vhost: vhost, username: username, password: password,
+                 on_tcp_connection_failure: server_down_error_handler) do |amqp|
       @amqp = amqp
       @channel = AMQP::Channel.new(amqp, prefetch: parallelism) do
         @channel.confirm_select
-        install_default_error_handler
+        install_channel_error_handler
+        install_lost_connection_error_handler
         k.call(self)
       end
     end
@@ -122,7 +126,7 @@ class Mercury
           k.call(false)
         else
           # failed for unknown reason
-          default_error_handler(ch, info)
+          handle_channel_error(ch, info)
         end
       end
       check.call(ch) do |result|
@@ -133,13 +137,32 @@ class Mercury
     end
   end
 
-  def install_default_error_handler
-    @channel.on_error(&method(:default_error_handler))
+  def server_down_error_handler
+    make_error_handler('Failed to establish connection to AMQP server. Exiting.')
   end
 
-  def default_error_handler(_ch, info)
+  def install_lost_connection_error_handler
+    @amqp.on_tcp_connection_loss(&make_error_handler('Lost connection to AMQP server. Exiting.'))
+  end
+
+  def install_channel_error_handler
+    @channel.on_error(&method(:handle_channel_error))
+  end
+
+  def handle_channel_error(_ch, info)
     @amqp.close do
-      raise "An error occurred: #{info.reply_code} - #{info.reply_text}"
+      make_error_handler("An error occurred: #{info.reply_code} - #{info.reply_text}").call
+    end
+  end
+
+  def make_error_handler(msg)
+    proc do
+      Logatron.error(msg)
+      if @on_error.respond_to?(:call)
+        @on_error.call(msg)
+      else
+        raise msg
+      end
     end
   end
 

data/lib/mercury/version.rb

@@ -1,3 +1,3 @@
 class Mercury
-  VERSION = '0.1.7'
+  VERSION = '0.1.9'
 end

data/spec/lib/mercury/monadic_spec.rb

@@ -268,6 +268,7 @@ describe Mercury::Monadic do
         let(:m2) { Mercury::Monadic.open }
         and_then { m2.start_worker(worker, source, &msgs.method(:push)) }
         and_then { wait_until { msgs.size == 2 } }
+        and_then { m2.close }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercury_amqp
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler