Permalink
Browse files

Merge commit 'chuckremes/master' into reconnect

* commit 'chuckremes/master':
  Clarified and corrected new #unbind/#unsubscribe/#subscribed? rdoc
  Small patch to add #subscribed? metho to MQ::Queue API
  Removed a debug statement used while creating rdoc
  Reworked all code examples so they use the MQ API instead of the
  Added rdoc to the main classes and modules used for building clients.
  • Loading branch information...
2 parents aed2e35 + 15a9fac commit 70f360440374a9f503d31623b455125efd4c2bd1 @tmm1 committed Jan 10, 2009
Showing with 568 additions and 61 deletions.
  1. +6 −1 lib/amqp.rb
  2. +1 −0 lib/amqp/protocol.rb
  3. +457 −33 lib/mq.rb
  4. +21 −5 lib/mq/exchange.rb
  5. +78 −17 lib/mq/queue.rb
  6. +5 −5 lib/mq/rpc.rb
View
@@ -61,7 +61,7 @@ def self.settings
# between the client and the server. Extremely useful for debugging.
#
# AMQP.start do
- # # default to connecting to localhost:5672
+ # # default is to connect to localhost:5672
#
# # define queues, exchanges and bindings here.
# # also define all subscriptions and/or publishers
@@ -71,6 +71,11 @@ def self.settings
# # is called.
# end
#
+ # Most code will use the MQ api. Any calls to MQ.direct / MQ.fanout /
+ # MQ.topic / MQ.queue will implicitly call #start. In those cases,
+ # it is sufficient to put your code inside of an EventMachine.run
+ # block. See the code examples in MQ for details.
+ #
def self.start *args, &blk
EM.run{
@conn ||= connect *args
View
@@ -66,6 +66,7 @@ def to_frame channel = 0
end
#:startdoc:
+ #
# Contains a properties hash that holds some potentially interesting
# information.
# * :delivery_mode
Oops, something went wrong.

0 comments on commit 70f3604

Please sign in to comment.