Skip to content

Commit

Permalink
Merge commit 'chuckremes/master' into reconnect
Browse files Browse the repository at this point in the history
* 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
tmm1 committed Jan 10, 2009
2 parents aed2e35 + 15a9fac commit 70f3604
Show file tree
Hide file tree
Showing 6 changed files with 568 additions and 61 deletions.
7 changes: 6 additions & 1 deletion lib/amqp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/amqp/protocol.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def to_frame channel = 0
end

#:startdoc:
#
# Contains a properties hash that holds some potentially interesting
# information.
# * :delivery_mode
Expand Down
Loading

0 comments on commit 70f3604

Please sign in to comment.