You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2018/03/28 19:27:33 UTC
[1/3] qpid-dispatch git commit: DISPATCH-947 - Modified 3 tests to
not use Messenger
Repository: qpid-dispatch
Updated Branches:
refs/heads/DISPATCH-938 a813cd363 -> 90a6e78fc
DISPATCH-947 - Modified 3 tests to not use Messenger
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/1242610d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/1242610d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/1242610d
Branch: refs/heads/DISPATCH-938
Commit: 1242610d6e784fd9fb86b77f812993cbd6ede22c
Parents: a813cd3
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Wed Mar 28 14:20:46 2018 -0400
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Wed Mar 28 14:20:46 2018 -0400
----------------------------------------------------------------------
tests/system_tests_one_router.py | 207 ++++++++++++++++++++--------------
1 file changed, 125 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1242610d/tests/system_tests_one_router.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py
index c20ccba..fc81cff 100644
--- a/tests/system_tests_one_router.py
+++ b/tests/system_tests_one_router.py
@@ -414,55 +414,9 @@ class OneRouterTest(TestCase):
self.assertEqual(None, test.error)
def test_21_semantics_closest(self):
- addr = self.address+"/closest.1"
- M1 = self.messenger()
- M2 = self.messenger()
- M3 = self.messenger()
- M4 = self.messenger()
-
-
- M1.start()
- M2.start()
- M3.start()
- M4.start()
-
- M2.subscribe(addr)
- M3.subscribe(addr)
- M4.subscribe(addr)
-
- tm = Message()
- rm = Message()
-
- tm.address = addr
- for i in range(30):
- tm.body = {'number': i}
- M1.put(tm)
- M1.send()
-
- i = 0
- rx_set = []
- for i in range(10):
- M2.recv(1)
- M2.get(rm)
- rx_set.append(rm.body['number'])
-
- M3.recv(1)
- M3.get(rm)
- rx_set.append(rm.body['number'])
-
- M4.recv(1)
- M4.get(rm)
- rx_set.append(rm.body['number'])
-
- self.assertEqual(30, len(rx_set))
- rx_set.sort()
- for i in range(30):
- self.assertEqual(i, rx_set[i])
-
- M1.stop()
- M2.stop()
- M3.stop()
- M4.stop()
+ test = SemanticsClosest(self.address)
+ test.run()
+ self.assertEqual(None, test.error)
def test_22_semantics_balanced(self):
test = SemanticsBalanced(self.address)
@@ -470,39 +424,8 @@ class OneRouterTest(TestCase):
self.assertEqual(None, test.error)
def test_23_to_override(self):
- addr = self.address+"/toov/1"
- M1 = self.messenger()
- M2 = self.messenger()
-
- M1.start()
- M2.start()
- M2.subscribe(addr)
-
- tm = Message()
- rm = Message()
-
- tm.address = addr
-
- ##
- ## Pre-existing TO
- ##
- tm.annotations = {'x-opt-qd.to': 'toov/1'}
- for i in range(10):
- tm.body = {'number': i}
- M1.put(tm)
- M1.send()
-
- for i in range(10):
- M2.recv(1)
- M2.get(rm)
- self.assertEqual(i, rm.body['number'])
- ma = rm.annotations
- self.assertEqual(ma.__class__, dict)
- self.assertEqual(ma['x-opt-qd.to'], 'toov/1')
-
- M1.stop()
- M2.stop()
-
+ test = MessageAnnotaionsPreExistingOverride(self.address)
+ test.run()
def test_24_send_settle_mode_settled(self):
"""
@@ -697,6 +620,126 @@ class OneRouterTest(TestCase):
client.connection.close()
+class SemanticsClosest(MessagingHandler):
+ def __init__(self, address):
+ super(SemanticsClosest, self).__init__()
+ self.address = address
+ self.dest = "closest.1"
+ self.timer = None
+ self.conn = None
+ self.sender = None
+ self.receiver_a = None
+ self.receiver_b = None
+ self.receiver_c = None
+ self.num_messages = 100
+ self.n_received_a = 0
+ self.n_received_b = 0
+ self.n_received_c = 0
+ self.error = None
+ self.n_sent = 0
+ self.rx_set = []
+
+ def on_start(self, event):
+ self.timer = event.reactor.schedule(TIMEOUT, Timeout(self))
+ self.conn = event.container.connect(self.address)
+ self.sender = event.container.create_sender(self.conn, self.dest)
+ # Receiver on same router as the sender must receive all the messages. The other two
+ # receivers are on the other router
+ self.receiver_a = event.container.create_receiver(self.conn, self.dest, name="A")
+ self.receiver_b = event.container.create_receiver(self.conn, self.dest, name="B")
+ self.receiver_c = event.container.create_receiver(self.conn, self.dest, name="C")
+
+ def timeout(self):
+ self.error = "Timeout Expired: sent=%d rcvd=%d/%d/%d" % \
+ (self.n_sent, self.n_received_a, self.n_received_b, self.n_received_c)
+ self.conn.close()
+
+ def check_if_done(self):
+ if self.n_received_a + self.n_received_b + self.n_received_c == self.num_messages\
+ and self.n_received_b != 0 and self.n_received_c != 0:
+ self.rx_set.sort()
+ #print self.rx_set
+ all_messages_received = True
+ for i in range(self.num_messages):
+ if not i == self.rx_set[i]:
+ all_messages_received = False
+
+ if all_messages_received:
+ self.timer.cancel()
+ self.conn.close()
+
+ def on_sendable(self, event):
+ if self.n_sent < self.num_messages:
+ msg = Message(body={'number': self.n_sent})
+ self.sender.send(msg)
+ self.n_sent += 1
+
+ def on_message(self, event):
+ if event.receiver == self.receiver_a:
+ self.n_received_a += 1
+ self.rx_set.append(event.message.body['number'])
+ if event.receiver == self.receiver_b:
+ self.n_received_b += 1
+ self.rx_set.append(event.message.body['number'])
+ if event.receiver == self.receiver_c:
+ self.n_received_c += 1
+ self.rx_set.append(event.message.body['number'])
+
+ def on_accepted(self, event):
+ self.check_if_done()
+
+ def run(self):
+ Container(self).run()
+
+
+class MessageAnnotaionsPreExistingOverride(MessagingHandler):
+ def __init__(self, address):
+ super(MessageAnnotaionsPreExistingOverride, self).__init__()
+ self.address = address
+ self.dest = "toov/1"
+ self.error = "Pre-existing x-opt-qd.to has been stripped"
+ self.timer = None
+ self.conn = None
+ self.sender = None
+ self.receiver = None
+ self.msg_not_sent = True
+
+ def on_start(self, event):
+ self.timer = event.reactor.schedule(TIMEOUT, Timeout(self))
+ self.conn = event.container.connect(self.address)
+ self.sender = event.container.create_sender(self.conn, self.dest)
+ self.receiver = event.container.create_receiver(self.conn, self.dest)
+
+ def timeout(self):
+ self.error = "Timeout Expired: Sent message not received"
+ self.conn.close()
+
+ def bail(self, message):
+ self.error = message
+ self.conn.close()
+ self.timer.cancel()
+
+ def on_sendable(self, event):
+ if self.msg_not_sent:
+ msg = Message(body={'number': 0})
+ msg.annotations = {'x-opt-qd.to': 'toov/1'}
+ event.sender.send(msg)
+ self.msg_not_sent = False
+
+ def on_message(self, event):
+ if 0 == event.message.body['number']:
+ ma = event.message.annotations
+ if ma['x-opt-qd.to'] == 'toov/1':
+ self.bail(None)
+ else:
+ self.bail("Pre-existing x-opt-qd.to has been stripped")
+ else:
+ self.bail("body does not match with the sent message body")
+
+ def run(self):
+ Container(self).run()
+
+
class SemanticsMulticast(MessagingHandler):
def __init__(self, address):
super(SemanticsMulticast, self).__init__()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-dispatch git commit: Remove config ref and add links to
qdrouterd.conf man page
Posted by ch...@apache.org.
Remove config ref and add links to qdrouterd.conf man page
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/3a8596a4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/3a8596a4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/3a8596a4
Branch: refs/heads/DISPATCH-938
Commit: 3a8596a4f7b620aa81e89fd38be45de5ce5a0b15
Parents: 1242610
Author: Ben Hardesty <bh...@redhat.com>
Authored: Fri Mar 16 11:00:26 2018 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Wed Mar 28 15:27:21 2018 -0400
----------------------------------------------------------------------
doc/new-book/attributes.adoc | 4 +--
doc/new-book/book.adoc | 3 ---
doc/new-book/configuration-connections.adoc | 4 +--
doc/new-book/configuration-security.adoc | 2 +-
doc/new-book/logging.adoc | 8 ++++++
doc/new-book/managing-using-qdmanage.adoc | 14 +++++-----
doc/new-book/routing.adoc | 28 ++++++++++++++++++++
.../understand-router-configuration.adoc | 2 +-
8 files changed, 49 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a8596a4/doc/new-book/attributes.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/attributes.adoc b/doc/new-book/attributes.adoc
index 3cc7080..7e0127a 100644
--- a/doc/new-book/attributes.adoc
+++ b/doc/new-book/attributes.adoc
@@ -42,7 +42,7 @@ under the License
:FragmentDir: common
:RouterName: Dispatch Router
:RouterSchemaDir: ../../build/doc/book
-:RouterVersion: 1.0
+:RouterVersion: 1.0.1
// Book names
@@ -50,7 +50,7 @@ under the License
// Doc links
-:BookUrlBase: https://qpid.apache.org/releases/qpid-dispatch-1.0.0
+:BookUrlBase: https://qpid.apache.org/releases/qpid-dispatch-{RouterVersion}
:ManagementEntitiesUrl: {BookUrlBase}/man/managementschema.html
:ManagementEntitiesLink: link:{ManagementEntitiesUrl}[{RouterName} Management Schema^]
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a8596a4/doc/new-book/book.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/book.adoc b/doc/new-book/book.adoc
index 3ce170f..4ed6bdf 100644
--- a/doc/new-book/book.adoc
+++ b/doc/new-book/book.adoc
@@ -57,8 +57,5 @@ include::technical-details-specifications.adoc[leveloffset=+1]
[appendix]
include::cyrus-sasl.adoc[leveloffset=+1]
-[appendix]
-include::configuration-reference.adoc[leveloffset=+1]
-
// Revision information
include::revision-info.adoc[]
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a8596a4/doc/new-book/configuration-connections.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/configuration-connections.adoc b/doc/new-book/configuration-connections.adoc
index 27ec361..ab967f7 100644
--- a/doc/new-book/configuration-connections.adoc
+++ b/doc/new-book/configuration-connections.adoc
@@ -44,7 +44,7 @@ listener {
`host`:: Either an IP address (IPv4 or IPv6) or hostname on which the router should listen for incoming connections.
`port`:: The port number or symbolic service name on which the router should listen for incoming connections.
-For information about additional attributes, see xref:router-configuration-file-listener[Listener] in the _Configuration Reference_.
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_listener[the `qdrouterd.conf` man page].
--
. If necessary, xref:securing-incoming-connections[secure the connection].
@@ -80,7 +80,7 @@ connector {
`host`:: Either an IP address (IPv4 or IPv6) or hostname on which the router should connect.
`port`:: The port number or symbolic service name on which the router should connect.
-For information about additional attributes, see xref:router-configuration-file-connector[Connector] in the _Configuration Reference_.
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_connector[the `qdrouterd.conf` man page].
--
. If necessary, xref:securing-outgoing-connections[secure the connection].
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a8596a4/doc/new-book/configuration-security.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/configuration-security.adoc b/doc/new-book/configuration-security.adoc
index 8909d74..92f60c3 100644
--- a/doc/new-book/configuration-security.adoc
+++ b/doc/new-book/configuration-security.adoc
@@ -116,7 +116,7 @@ For example:
password: routerKeyPassword
----
-For information about additional `sslProfile` attributes, see xref:router-configuration-file-sslprofile[_sslProfile_] in the _Configuration Reference_.
+For information about additional `sslProfile` attributes, see link:{qdrouterdConfManPageUrl}#_sslprofile[the `qdrouterd.conf` man page].
--
[id='setting-up-sasl-for-authentication-and-payload-encryption']
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a8596a4/doc/new-book/logging.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/logging.adoc b/doc/new-book/logging.adoc
index 465f71c..c548e99 100644
--- a/doc/new-book/logging.adoc
+++ b/doc/new-book/logging.adoc
@@ -291,7 +291,11 @@ To specify multiple levels, use a comma-separated list. You can also use `+` to
//end::logging-levels[]
`timestamp`:: Set this to `yes` to include the timestamp in all logs.
+<<<<<<< HEAD
For information about additional log attributes, see xref:router-configuration-file-log[Log] in the _Configuration Reference_.
+=======
+For information about additional log attributes, see link:{qdrouterdConfManPageUrl}#_log[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. Add an additional `log` section for each logging module that should not follow the default logging configuration:
@@ -312,7 +316,11 @@ log {
+
include::logging.adoc[tags=logging-levels]
+<<<<<<< HEAD
For information about additional log attributes, see xref:router-configuration-file-log[Log] in the _Configuration Reference_.
+=======
+For information about additional log attributes, see link:{qdrouterdConfManPageUrl}#_log[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
== Viewing Log Entries
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a8596a4/doc/new-book/managing-using-qdmanage.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/managing-using-qdmanage.adoc b/doc/new-book/managing-using-qdmanage.adoc
index ddf8648..5a1cd3e 100644
--- a/doc/new-book/managing-using-qdmanage.adoc
+++ b/doc/new-book/managing-using-qdmanage.adoc
@@ -85,7 +85,7 @@ You can use `qdmanage` to view, create, update, and delete listeners and connect
Listeners define how clients can connect to a router. The following table lists the `qdmanage` commands you can use to perform common operations on listeners.
-For more information about the attributes you can use with these commands, see the xref:router-configuration-file-listener[listener] section in the _Configuration Reference_.
+For more information about the attributes you can use with these commands, see link:{qdrouterdConfManPageUrl}#_listener[the `qdrouterd.conf` man page].
//tag::qdmanage-connection-options-note[]
[NOTE]
@@ -188,7 +188,7 @@ qdmanage delete --name=_LISTENER_NAME_
Connectors define how the router can connect to other endpoints in your messaging network, such as brokers and other routers. The following table lists the `qdmanage` commands you can use to perform common operations on connectors.
-For more information about the attributes you can use with these commands, see the xref:router-configuration-file-connector[connector] section in the _Configuration Reference_.
+For more information about the attributes you can use with these commands, see link:{qdrouterdConfManPageUrl}#_connector[the `qdrouterd.conf` man page].
// Note about qdmanage connection options.
include::managing-using-qdmanage.adoc[tags=qdmanage-connection-options-note]
@@ -297,7 +297,7 @@ qdmanage delete --name=_CONNECTOR_NAME_
{RouterName} supports SSL/TLS for certificate-level encryption and mutual authentication. The following table lists the common `qdmanage` commands you can use to secure incoming and outgoing connections for a router in your router network.
-For more information about the attributes you can use with these commands, see the xref:router-configuration-file-sslprofile[sslProfile] and xref:router-configuration-file-listener[listener] sections in the _Configuration Reference_.
+For more information about the attributes you can use with these commands, see link:{qdrouterdConfManPageUrl}#_sslprofile[the `qdrouterd.conf` man page].
// Note about qdmanage connection options.
include::managing-using-qdmanage.adoc[tags=qdmanage-connection-options-note]
@@ -375,7 +375,7 @@ qdmanage delete --name=_SSL_PROFILE_NAME_
{RouterName} supports SASL for authentication and payload encryption. The following table lists the common `qdmanage` commands you can use to secure incoming and outgoing connections for a router in your router network.
-For more information about the attributes you can use with these commands, see the xref:router-configuration-file-router[router] and xref:router-configuration-file-listener[listener] sections in the _Configuration Reference_.
+For more information about the attributes you can use with these commands, see link:{qdrouterdConfManPageUrl}#_router[the `qdrouterd.conf` man page].
// Note about qdmanage connection options.
include::managing-using-qdmanage.adoc[tags=qdmanage-connection-options-note]
@@ -457,7 +457,7 @@ qdmanage update --type=router --saslConfigPath --saslConfigName
Message routing involves configuring addresses to define how {RouterName} should distribute messages. The following table lists the common `qdmanage` commands you can use to configure addresses for a router in your router network.
-For more information about the attributes you can use with these commands, see the xref:router-configuration-file-address[address] and xref:router-configuration-file-autolink[autoLink] sections in the _Configuration Reference_.
+For more information about the attributes you can use with these commands, see link:{qdrouterdConfManPageUrl}#_address[address] and link:{qdrouterdConfManPageUrl}#_autolink[autolink] in the `qdrouterd.conf` man page.
// Note about qdmanage connection options.
include::managing-using-qdmanage.adoc[tags=qdmanage-connection-options-note]
@@ -574,7 +574,7 @@ qdmanage delete --name=_AUTOLINK_NAME_
A link route is a chain of links between a sender and receiver that provides a private messaging path. The following table lists the common `qdmanage` commands you can use to view, create, update, and delete link routes.
-For more information about the attributes you can use with these commands, see the xref:router-configuration-file-linkroute[linkRoute] section in the _Configuration Reference_.
+For more information about the attributes you can use with these commands, see the link:{qdrouterdConfManPageUrl}#_linkroute[the `qdrouterd.conf` man page].
// Note about qdmanage connection options.
include::managing-using-qdmanage.adoc[tags=qdmanage-connection-options-note]
@@ -632,7 +632,7 @@ qdmanage delete --name=_OUTGOING_LINK_ROUTE_NAME_
{RouterName} logs are broken into different categories called logging modules. Each module provides important information about a particular aspect of a router. The following table lists the common `qdmanage` commands you can use to view and change the configuration of a logging module.
-For more information about the attributes you can use with these commands, see the xref:router-configuration-file-log[log] section in the _Configuration Reference_.
+For more information about the attributes you can use with these commands, see link:{qdrouterdConfManPageUrl}#_log[the `qdrouterd.conf` man page].
// Note about qdmanage connection options.
include::managing-using-qdmanage.adoc[tags=qdmanage-connection-options-note]
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a8596a4/doc/new-book/routing.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/routing.adoc b/doc/new-book/routing.adoc
index a7f5fc1..aaa2373 100644
--- a/doc/new-book/routing.adoc
+++ b/doc/new-book/routing.adoc
@@ -248,7 +248,11 @@ You can convert a `prefix` value to a `pattern` by appending `/\#` to it. For ex
+
For more information about message distribution patterns, see xref:routing-patterns-overview[Routing Patterns].
+<<<<<<< HEAD
For information about additional attributes, see xref:router-configuration-file-address[Address] in the _Configuration Reference_.
+=======
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_address[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. Add the same `address` section to any other routers that need to use the address.
@@ -346,7 +350,11 @@ connector {
`port`:: The port number or symbolic service name on which the router should connect to the broker.
`role`:: Specify `route-container` to indicate that this connection is for an external container (broker).
+<<<<<<< HEAD
For information about additional attributes, see xref:router-configuration-file-connector[Connector] in the _Configuration Reference_.
+=======
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_connector[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want to send messages to the broker queue, create an outgoing autolink to the broker queue:
@@ -367,7 +375,11 @@ autoLink {
`connection` | `containerID`:: How the router should connect to the broker. You can specify either an outgoing connection (`connection`) or the container ID of the broker (`containerID`).
`direction`:: Set this attribute to `out` to specify that this autolink can send messages from the router to the broker.
+<<<<<<< HEAD
For information about additional attributes, see xref:router-configuration-file-autolink[autoLink] in the _Configuration Reference_.
+=======
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_autolink[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want to receive messages from the broker queue, create an incoming autolink from the broker queue:
@@ -388,7 +400,11 @@ autoLink {
`connection` | `containerID`:: How the router should connect to the broker. You can specify either an outgoing connection (`connection`) or the container ID of the broker (`containerID`).
`direction`:: Set this attribute to `in` to specify that this autolink can receive messages from the broker to the router.
+<<<<<<< HEAD
For information about additional attributes, see xref:router-configuration-file-autolink[autoLink] in the _Configuration Reference_.
+=======
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_autolink[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
=== Example: Routing Messages Through Broker Queues
@@ -572,7 +588,11 @@ connector {
`port`:: The port number or symbolic service name on which the router should connect to the broker.
`role`:: Specify `route-container` to indicate that this connection is for an external container (broker).
+<<<<<<< HEAD
For information about additional attributes, see xref:router-configuration-file-connector[Connector] in the _Configuration Reference_.
+=======
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_connector[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want clients to send messages on this link route, create an incoming link route:
@@ -600,7 +620,11 @@ If multiple brokers are connected to the router through this connection, request
`direction`:: Set this attribute to `in` to specify that clients can send messages into the router network on this link route.
+<<<<<<< HEAD
For information about additional attributes, see xref:router-configuration-file-linkroute[linkRoute] in the _Configuration Reference_.
+=======
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_linkroute[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want clients to receive messages on this link route, create an outgoing link route:
@@ -627,7 +651,11 @@ include::routing.adoc[tags=pattern-matching]
If multiple brokers are connected to the router through this connection, requests for addresses matching the link route's prefix or pattern are balanced across the brokers. Alternatively, if you want to specify a particular broker, use `containerID` and add the broker's container ID.
`direction`:: Set this attribute to `out` to specify that this link route is for receivers.
+<<<<<<< HEAD
For information about additional attributes, see xref:router-configuration-file-linkroute[linkRoute] in the _Configuration Reference_.
+=======
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_linkroute[the `qdrouterd.conf` man page].
+>>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
=== Example: Using a Link Route to Provide Client Isolation
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a8596a4/doc/new-book/understand-router-configuration.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/understand-router-configuration.adoc b/doc/new-book/understand-router-configuration.adoc
index 3191a97..5230b27 100644
--- a/doc/new-book/understand-router-configuration.adoc
+++ b/doc/new-book/understand-router-configuration.adoc
@@ -178,7 +178,7 @@ router {
* `interior` - Use this mode if the router is part of a router network and needs to collaborate with other routers.
`id`:: The unique identifier for the router. This ID will also be the container name at the AMQP protocol level.
-For information about additional attributes, see xref:router-configuration-file-router[Router] in the _Configuration Reference_.
+For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_router[the `qdrouterd.conf` man page].
--
. If necessary for your environment, secure the router.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-dispatch git commit: Remove merge conflict msgs
Posted by ch...@apache.org.
Remove merge conflict msgs
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/90a6e78f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/90a6e78f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/90a6e78f
Branch: refs/heads/DISPATCH-938
Commit: 90a6e78fc8c6cff71bb6f46fb5c3782bb1c42ccb
Parents: 3a8596a
Author: Ben Hardesty <bh...@redhat.com>
Authored: Fri Mar 16 11:08:27 2018 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Wed Mar 28 15:27:21 2018 -0400
----------------------------------------------------------------------
doc/new-book/logging.adoc | 8 --------
doc/new-book/routing.adoc | 28 ----------------------------
2 files changed, 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/90a6e78f/doc/new-book/logging.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/logging.adoc b/doc/new-book/logging.adoc
index c548e99..2f929c9 100644
--- a/doc/new-book/logging.adoc
+++ b/doc/new-book/logging.adoc
@@ -291,11 +291,7 @@ To specify multiple levels, use a comma-separated list. You can also use `+` to
//end::logging-levels[]
`timestamp`:: Set this to `yes` to include the timestamp in all logs.
-<<<<<<< HEAD
-For information about additional log attributes, see xref:router-configuration-file-log[Log] in the _Configuration Reference_.
-=======
For information about additional log attributes, see link:{qdrouterdConfManPageUrl}#_log[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. Add an additional `log` section for each logging module that should not follow the default logging configuration:
@@ -316,11 +312,7 @@ log {
+
include::logging.adoc[tags=logging-levels]
-<<<<<<< HEAD
-For information about additional log attributes, see xref:router-configuration-file-log[Log] in the _Configuration Reference_.
-=======
For information about additional log attributes, see link:{qdrouterdConfManPageUrl}#_log[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
== Viewing Log Entries
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/90a6e78f/doc/new-book/routing.adoc
----------------------------------------------------------------------
diff --git a/doc/new-book/routing.adoc b/doc/new-book/routing.adoc
index aaa2373..e1e039a 100644
--- a/doc/new-book/routing.adoc
+++ b/doc/new-book/routing.adoc
@@ -248,11 +248,7 @@ You can convert a `prefix` value to a `pattern` by appending `/\#` to it. For ex
+
For more information about message distribution patterns, see xref:routing-patterns-overview[Routing Patterns].
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-address[Address] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_address[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. Add the same `address` section to any other routers that need to use the address.
@@ -350,11 +346,7 @@ connector {
`port`:: The port number or symbolic service name on which the router should connect to the broker.
`role`:: Specify `route-container` to indicate that this connection is for an external container (broker).
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-connector[Connector] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_connector[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want to send messages to the broker queue, create an outgoing autolink to the broker queue:
@@ -375,11 +367,7 @@ autoLink {
`connection` | `containerID`:: How the router should connect to the broker. You can specify either an outgoing connection (`connection`) or the container ID of the broker (`containerID`).
`direction`:: Set this attribute to `out` to specify that this autolink can send messages from the router to the broker.
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-autolink[autoLink] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_autolink[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want to receive messages from the broker queue, create an incoming autolink from the broker queue:
@@ -400,11 +388,7 @@ autoLink {
`connection` | `containerID`:: How the router should connect to the broker. You can specify either an outgoing connection (`connection`) or the container ID of the broker (`containerID`).
`direction`:: Set this attribute to `in` to specify that this autolink can receive messages from the broker to the router.
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-autolink[autoLink] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_autolink[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
=== Example: Routing Messages Through Broker Queues
@@ -588,11 +572,7 @@ connector {
`port`:: The port number or symbolic service name on which the router should connect to the broker.
`role`:: Specify `route-container` to indicate that this connection is for an external container (broker).
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-connector[Connector] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_connector[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want clients to send messages on this link route, create an incoming link route:
@@ -620,11 +600,7 @@ If multiple brokers are connected to the router through this connection, request
`direction`:: Set this attribute to `in` to specify that clients can send messages into the router network on this link route.
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-linkroute[linkRoute] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_linkroute[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
. If you want clients to receive messages on this link route, create an outgoing link route:
@@ -651,11 +627,7 @@ include::routing.adoc[tags=pattern-matching]
If multiple brokers are connected to the router through this connection, requests for addresses matching the link route's prefix or pattern are balanced across the brokers. Alternatively, if you want to specify a particular broker, use `containerID` and add the broker's container ID.
`direction`:: Set this attribute to `out` to specify that this link route is for receivers.
-<<<<<<< HEAD
-For information about additional attributes, see xref:router-configuration-file-linkroute[linkRoute] in the _Configuration Reference_.
-=======
For information about additional attributes, see link:{qdrouterdConfManPageUrl}#_linkroute[the `qdrouterd.conf` man page].
->>>>>>> Remove outdated config ref and add links to qdrouterd.conf
--
=== Example: Using a Link Route to Provide Client Isolation
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org