From b00e749a170b09db7e24161baa809c11fa65531f Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 11 Mar 2010 18:23:46 +0000 Subject: QPID-2382: Created separate utility class for handling updates from failover exchange; cleaned up reconnection options git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@921971 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/include/qpid/messaging/Address.h | 17 ++++++++++------- cpp/include/qpid/messaging/Connection.h | 27 +++++++++++++++------------ 2 files changed, 25 insertions(+), 19 deletions(-) (limited to 'cpp/include') diff --git a/cpp/include/qpid/messaging/Address.h b/cpp/include/qpid/messaging/Address.h index 745949792d..f3ca30bcd4 100644 --- a/cpp/include/qpid/messaging/Address.h +++ b/cpp/include/qpid/messaging/Address.h @@ -79,6 +79,11 @@ class AddressImpl; * nide when a sender or receiver is cancelled. Can be one of always, * never, sender or receiver. * + * reliabilityindicates the level of + * reliability expected. Can be one of unreliable, at-most-once, + * at-least-once or exactly-once (the latter is not yet correctly + * supported). + * * node-propertiesA nested map of properties of the addressed * entity or 'node'. These can be used when automatically creating it, * or to assert certain properties. @@ -109,16 +114,14 @@ class AddressImpl; * receiver does not want to receiver messages published to the topic * that originate from a sender on the same connection * - * browse(only relevant for queues) specifies that the receiver - * does not wish to consume the messages, but merely browse them + * mode(only relevant for queues) + * indicates whether the subscribe should consume (the default) or + * merely browse the messages. Valid values are 'consume' and + * 'browse' * * durable(only relevant for topics at present) specifies that a * durable subscription is required * - * reliabilityindicates the level of reliability that the receiver - * expects. Can be one of unreliable, at-most-once, at-least-once or - * exactly-once (the latter is not yet correctly supported). - * * filter(only relevant for topics at present) allows bindings to * be created for the queue that match the given criteria (or list of * criteria). @@ -133,7 +136,7 @@ class AddressImpl; *
  • exclusive, which requests an exclusive subscription and * is only relevant for queues
    • * - *
  • x-queue-arguments, which ais only relevant for topics and + *
  • x-queue-arguments, which is only relevant for topics and * allows arguments to the queue-declare for the subscription * queue to be specified
    • * diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h index 36392da0b2..e2d1cc2ed4 100644 --- a/cpp/include/qpid/messaging/Connection.h +++ b/cpp/include/qpid/messaging/Connection.h @@ -58,29 +58,32 @@ class Connection : public qpid::client::Handle * sasl-mechanism * sasl-min-ssf * sasl-max-ssf + * protocol + * urls * - * (note also bounds, locale, max-channels and max-framesize, but not sure whether those should be docuemented here) + * (note also bounds, locale, max-channels and max-framesize, but + * not sure whether those should be documented here) * - * Retry behaviour can be controlled through the following options: - * - * reconnection-timeout - determines how long it will try to - * reconnect for -1 means forever, 0 - * means don't try to reconnect - * min-retry-interval - * max-retry-interval + * Reconnect behaviour can be controlled through the following options: * - * The retry-interval is the time that the client waits for - * after a failed attempt to reconnect before retrying. It + * reconnect: true/false (enables/disables reconnect entirely) + * reconnect-timeout: number of seconds (give up and report failure after specified time) + * reconnect-limit: n (give up and report failure after specified number of attempts) + * reconnect-interval-min: number of seconds (initial delay between failed reconnection attempts) + * reconnect-interval-max: number of seconds (maximum delay between failed reconnection attempts) + * reconnect-interval: shorthand for setting the same reconnect_interval_min/max + * + * The reconnect-interval is the time that the client waits + * for after a failed attempt to reconnect before retrying. It * starts at the value of the min-retry-interval and is * doubled every failure until the value of max-retry-interval * is reached. - * - * */ QPID_CLIENT_EXTERN Connection(const Variant::Map& options = Variant::Map()); QPID_CLIENT_EXTERN Connection(const std::string& options); QPID_CLIENT_EXTERN ~Connection(); QPID_CLIENT_EXTERN Connection& operator=(const Connection&); + QPID_CLIENT_EXTERN void setOption(const std::string& name, const Variant& value); QPID_CLIENT_EXTERN void open(const std::string& url); QPID_CLIENT_EXTERN void close(); QPID_CLIENT_EXTERN Session newSession(bool transactional, const std::string& name = std::string()); -- cgit v1.2.1