I'm seeing several of the c++ tests failing on trunk (sasl_fed,
cli_test, run_msg_group_tests) and have tracked it down to this commit
(i.e. r1404836).
The problem appears to be that the default for the -a option
reintroduced here, overrides any actual setting of the recommended -b
option.
On 11/01/2012 11:56 PM, [email protected] wrote:
Author: jross
Date: Thu Nov 1 23:56:33 2012
New Revision: 1404836
URL: http://svn.apache.org/viewvc?rev=1404836&view=rev
Log:
QPID-4410: Restore compatibility with pre-0.18 qpid-config command line
options; this is a patch from Ernie Allen
Modified:
qpid/trunk/qpid/tools/src/py/qpid-config
Modified: qpid/trunk/qpid/tools/src/py/qpid-config
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-config?rev=1404836&r1=1404835&r2=1404836&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-config (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-config Thu Nov 1 23:56:33 2012
@@ -18,10 +18,8 @@
# specific language governing permissions and limitations
# under the License.
#
-import pdb
-
import os
-from optparse import OptionParser, OptionGroup, IndentedHelpFormatter
+from optparse import OptionParser, OptionGroup, IndentedHelpFormatter,
SUPPRESS_HELP
import sys
import locale
@@ -49,7 +47,7 @@ description = """
Examples:
$ qpid-config add queue q
-$ qpid-config add exchange direct d -a localhost:5672
+$ qpid-config add exchange direct d -b localhost:5672
$ qpid-config exchanges -b 10.1.1.7:10000
$ qpid-config queues -b guest/guest@broker-host:10000
@@ -175,6 +173,7 @@ def OptionsAndArguments(argv):
group1.add_option("-t", "--timeout", action="store", type="int", default=10,
metavar="<secs>", help="Maximum time to wait for broker connection (in seconds)")
group1.add_option("-r", "--recursive", action="store_true", help="Show
bindings in queue or exchange list")
group1.add_option("-b", "--broker", action="store", type="string", default="localhost:5672",
metavar="<address>", help="Address of qpidd broker with syntax: [username/password@] hostname | ip-address [:<port>]")
+ group1.add_option("-a", "--broker-addr", action="store", type="string",
default="localhost:5672", metavar="<address>", help=SUPPRESS_HELP)
group1.add_option("--sasl-mechanism", action="store", type="string",
metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5,
GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.")
group1.add_option("--ssl-certificate", action="store", type="string",
metavar="<cert>", help="Client SSL certificate (PEM Format)")
group1.add_option("--ssl-key", action="store", type="string", metavar="<key>",
help="Client SSL private key (PEM Format)")
@@ -245,6 +244,8 @@ def OptionsAndArguments(argv):
config._recursive = True
if opts.broker:
config._host = opts.broker
+ if opts.broker_addr:
+ config._host = opts.broker_addr
if opts.timeout is not None:
config._connTimeout = opts.timeout
if config._connTimeout == 0:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
