diff options
Diffstat (limited to 'qpid/doc')
| -rw-r--r-- | qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml | 4 | ||||
| -rw-r--r-- | qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml index f747cdb747..7e1b905373 100644 --- a/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml +++ b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml @@ -781,11 +781,11 @@ NOTE: fencing is not shown, you must configure fencing appropriately for your cl </variablelist> <para> - In a Connection URL, heartbeat is set using the <command>idle_timeout</command> property, which is an integer corresponding to the heartbeat period in seconds. For instance, the following line from a JNDI properties file sets the heartbeat time out to 3 seconds: + In a Connection URL, heartbeat is set using the <command>heartbeat</command> property, which is an integer corresponding to the heartbeat period in seconds. For instance, the following line from a JNDI properties file sets the heartbeat time out to 3 seconds: </para> <screen> - connectionfactory.qpidConnectionfactory = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672',idle_timeout=3 + connectionfactory.qpidConnectionfactory = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'&heartbeat='3' </screen> </section> </section> diff --git a/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml index e2f6d8756c..d5527850c8 100644 --- a/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml +++ b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml @@ -3176,7 +3176,8 @@ spout - -content "$(cat rdu.xml | sed -e 's/70/45/')" xml/weather integer </entry> <entry> - frequency of heartbeat messages (in seconds) + Frequency of heartbeat messages (in seconds). A value of 0 disables heartbeating. <para>For compatibility + with old client configuration, option <varname>idle_timeout</varname> (in milliseconds) is also supported.</para> </entry> </row> <row> @@ -3599,10 +3600,9 @@ spout - -content "$(cat rdu.xml | sed -e 's/70/45/')" xml/weather <row> <entry>qpid.heartbeat</entry> <entry>int</entry> - <entry>120 (secs)</entry> - <entry>The heartbeat interval in seconds. Two consective misssed heartbeats will result in the connection timing out.<para>This can also be set per connection using the <link linkend="section-jms-connection-url">Connection URL</link> options.</para></entry> + <entry><para>When using the 0-10 protocol, the default is 120 (secs)</para><para>When using protocols 0-8...0-91, the default is the broker-supplied value.</para></entry> + <entry>Frequency of heartbeat messages (in seconds). A value of 0 disables heartbeating. <para>Two consective misssed heartbeats will result in the connection timing out.</para><para>This can also be set per connection using the <link linkend="section-jms-connection-url">Connection URL</link> options.</para><para>For compatibility with old client configuration, the synonym <varname>amqj.heartbeat.delay</varname> is supported.</para></entry> </row> - <row> <entry>ignore_setclientID</entry> <entry>boolean</entry> |