Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:tmm1/amqp
Browse files Browse the repository at this point in the history
* 'master' of git@github.com:tmm1/amqp:
  allow users to pass through the insist option for rabbitmq clustered mode
  Changed all exception classes to descend from StandardError instead of Exception.
  • Loading branch information
tmm1 committed Dec 25, 2008
2 parents 8d5928a + fb8057d commit 49029c5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions lib/amqp/buffer.rb
Expand Up @@ -10,8 +10,8 @@ def enum_with_index

module AMQP
class Buffer
class Overflow < Exception; end
class InvalidType < Exception; end
class Overflow < StandardError; end
class InvalidType < StandardError; end

def initialize data = ''
@data = data
Expand Down
4 changes: 2 additions & 2 deletions lib/amqp/client.rb
@@ -1,7 +1,7 @@
require 'amqp/frame'

module AMQP
class Error < Exception; end
class Error < StandardError; end

module BasicClient
def process_frame frame
Expand Down Expand Up @@ -30,7 +30,7 @@ def process_frame frame

send Protocol::Connection::Open.new(:virtual_host => @settings[:vhost],
:capabilities => '',
:insist => false)
:insist => @settings[:insist])

when Protocol::Connection::OpenOk
succeed(self)
Expand Down
2 changes: 1 addition & 1 deletion lib/amqp/frame.rb
Expand Up @@ -33,7 +33,7 @@ def == frame
end
end

class Invalid < Exception; end
class Invalid < StandardError; end

class Method
def initialize payload = nil, channel = 0
Expand Down
2 changes: 1 addition & 1 deletion lib/mq.rb
Expand Up @@ -11,7 +11,7 @@ class << self
attr_accessor :logging
end

class Error < Exception; end
class Error < StandardError; end
end

class MQ
Expand Down
4 changes: 2 additions & 2 deletions old/amqpc.rb
Expand Up @@ -6,8 +6,8 @@
require 'amqp_spec'

module AMQP
class BufferOverflow < Exception; end
class InvalidFrame < Exception; end
class BufferOverflow < StandardError; end
class InvalidFrame < StandardError; end

module Protocol
class Class::Method
Expand Down

0 comments on commit 49029c5

Please sign in to comment.