From f83677056891e436bf5ba99e79240df2a44528cd Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 14:42:12 +0000 Subject: Merged out from trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/include/qpid/messaging/Connection.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'cpp/include/qpid/messaging/Connection.h') diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h index 1ad7a7242f..165573e2ef 100644 --- a/cpp/include/qpid/messaging/Connection.h +++ b/cpp/include/qpid/messaging/Connection.h @@ -42,7 +42,7 @@ class Session; * A connection represents a network connection to a remote endpoint. */ -class Connection : public qpid::messaging::Handle +class QPID_MESSAGING_CLASS_EXTERN Connection : public qpid::messaging::Handle { public: QPID_MESSAGING_EXTERN Connection(ConnectionImpl* impl); @@ -54,27 +54,27 @@ class Connection : public qpid::messaging::Handle * username * password * heartbeat - * tcp-nodelay - * sasl-mechanism - * sasl-service - * sasl-min-ssf - * sasl-max-ssf + * tcp_nodelay + * sasl_mechanisms + * sasl_service + * sasl_min_ssf + * sasl_max_ssf * transport * * Reconnect behaviour can be controlled through the following options: * * 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 - * reconnect-urls: list of alternate urls to try when connecting + * 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 + * reconnect_urls: list of alternate urls to try when connecting * - * The reconnect-interval is the time that the client waits + * 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 + * starts at the value of the min_retry_interval and is + * doubled every failure until the value of max_retry_interval * is reached. */ QPID_MESSAGING_EXTERN Connection(const std::string& url, const qpid::types::Variant::Map& options = qpid::types::Variant::Map()); -- cgit v1.2.1