You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2012/11/02 00:56:34 UTC
svn commit: r1404836 - /qpid/trunk/qpid/tools/src/py/qpid-config
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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
Re: [c++]: Tests failing on trunk (was Re: svn commit: r1404836 -
/qpid/trunk/qpid/tools/src/py/qpid-config)
Posted by Alan Conway <ac...@redhat.com>.
On Fri, 2012-11-09 at 09:04 -0500, Justin Ross wrote:
> Sorry about the delay. Alan mentioned the same problem. I've reverted
> the change and asked Ernie for an improved patch.
>
Did that already:
------------------------------------------------------------------------
r1407674 | aconway | 2012-11-09 17:32:19 -0500 (Fri, 09 Nov 2012) | 4
lines
QPID-4410: Fix qpid-config argument parsing, broken by recent commit
r1404836
Only the new --broker-addr option was working, the --broker option was
being ignored.
------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
Re: [c++]: Tests failing on trunk (was Re: svn commit: r1404836 -
/qpid/trunk/qpid/tools/src/py/qpid-config)
Posted by Justin Ross <jr...@redhat.com>.
Sorry about the delay. Alan mentioned the same problem. I've reverted
the change and asked Ernie for an improved patch.
Justin
On Fri, 9 Nov 2012, Gordon Sim wrote:
> 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, jross@apache.org 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: commits-unsubscribe@qpid.apache.org
>> For additional commands, e-mail: commits-help@qpid.apache.org
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
> For additional commands, e-mail: dev-help@qpid.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org
[c++]: Tests failing on trunk (was Re: svn commit: r1404836 - /qpid/trunk/qpid/tools/src/py/qpid-config)
Posted by Gordon Sim <go...@gmail.com>.
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, jross@apache.org 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: commits-unsubscribe@qpid.apache.org
> For additional commands, e-mail: commits-help@qpid.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org