amq-client 0.7.0.alpha31 → 0.7.0.alpha32

data/examples/eventmachine_adapter/error_handling/handling_a_channel_level_exception.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+__dir = File.dirname(File.expand_path(__FILE__))
+require File.join(__dir, "..", "example_helper")
+
+amq_client_example "Declare a new fanout exchange" do |connection|
+  channel = AMQ::Client::Channel.new(connection, 1)
+  channel.open do
+    puts "Channel #{channel.id} is now open!"
+
+    channel.on_error do |ch, close|
+      puts "Handling a channel-level exception: #{close.reply_text}"
+    end
+
+    EventMachine.add_timer(0.4) do
+      # these two definitions result in a race condition. For sake of this example,
+      # however, it does not matter. Whatever definition succeeds first, 2nd one will
+      # cause a channel-level exception (because attributes are not identical)
+      AMQ::Client::Queue.new(connection, channel, "amqpgem.examples.channel_exception").declare(false, false, false, true) do |queue|
+        puts "#{queue.name} is ready to go"
+      end
+
+      AMQ::Client::Queue.new(connection, channel, "amqpgem.examples.channel_exception").declare(false, true, false, false) do |queue|
+        puts "#{queue.name} is ready to go"
+      end
+    end
+  end
+
+
+  show_stopper = Proc.new do
+    $stdout.puts "Stopping..."
+
+    connection.close {
+      EM.stop { exit }
+    }
+  end
+
+  Signal.trap "INT", show_stopper
+  EM.add_timer(2, show_stopper)
+end

data/lib/amq/client/adapter.rb

@@ -26,21 +26,16 @@ module AMQ
 
         host.class_eval do
 
-          #
-          # Behaviors
-          #
-
-          include Entity
-
-
-
           #
           # API
           #
 
           attr_accessor :logger
           attr_accessor :settings
-          attr_accessor :connection
+
+          # @return [Array<#call>]
+          attr_reader :callbacks
+
 
           # The locale defines the language in which the server will send reply texts.
           #
@@ -172,7 +167,9 @@ module AMQ
       # Behaviors
       #
 
-      include AMQ::Client::Openable
+      include Openable
+      include Callbacks
+
 
       extend RegisterEntityMixin
 
@@ -367,6 +364,23 @@ module AMQ
 
 
 
+
+      # @group Error handling
+
+      # Defines a callback that will be executed when channel is closed after
+      # channel-level exception. Only one callback can be added (the one added last
+      # replaces previous added ones).
+      #
+      # @api public
+      def on_error(&block)
+        self.redefine_callback(:error, &block)
+      end
+
+      # @endgroup
+
+
+
+
       # Handles connection.start.
       #
       # @api plugin
@@ -420,8 +434,7 @@ module AMQ
 
         closed!
         # TODO: use proper exception class, provide protocol class (we know conn_close.class_id and conn_close.method_id) as well!
-        error = RuntimeError.new(conn_close.reply_text)
-        self.error(error)
+        self.exec_callback_yielding_self(:error, conn_close)
       end
 
 

data/lib/amq/client/adapters/coolio.rb

@@ -139,7 +139,7 @@ module AMQ
       def initialize
         # Be careful with default values for #ruby hashes: h = Hash.new(Array.new); h[:key] ||= 1
         # won't assign anything to :key. MK.
-        @callbacks   = {}
+        @callbacks    = Hash.new
 
         self.logger   = self.class.logger
 

data/lib/amq/client/adapters/event_machine.rb

@@ -137,6 +137,7 @@ module AMQ
 
         @frames            = Array.new
         @channels          = Hash.new
+        @callbacks         = Hash.new
 
         opening!
 
@@ -359,9 +360,9 @@ module AMQ
 
 
       def reset
-        @size    = 0
-        @payload = ""
-        @frames  = Array.new
+        @size      = 0
+        @payload   = ""
+        @frames    = Array.new
 
         @chunk_buffer                 = ""
         @connection_deferrable        = EventMachine::DefaultDeferrable.new

data/lib/amq/client/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Client
-    VERSION = "0.7.0.alpha31"
+    VERSION = "0.7.0.alpha32"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: -3702664430
+  hash: -3702664340
   prerelease: 6
   segments: 
   - 0
   - 7
   - 0
   - alpha
-  - 31
-  version: 0.7.0.alpha31
+  - 32
+  version: 0.7.0.alpha32
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 Z
+date: 2011-05-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -117,6 +117,7 @@ files:
 - examples/eventmachine_adapter/connection_failure_callback.rb
 - examples/eventmachine_adapter/connection_failure_exception.rb
 - examples/eventmachine_adapter/connection_loss_handler.rb
+- examples/eventmachine_adapter/error_handling/handling_a_channel_level_exception.rb
 - examples/eventmachine_adapter/example_helper.rb
 - examples/eventmachine_adapter/exchange_declare.rb
 - examples/eventmachine_adapter/extensions/rabbitmq/handling_confirm_select_ok.rb