diff options
Diffstat (limited to 'tools/src/py/qpid-config')
| -rwxr-xr-x | tools/src/py/qpid-config | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/src/py/qpid-config b/tools/src/py/qpid-config index df43b7ea4e..2bab892c95 100755 --- a/tools/src/py/qpid-config +++ b/tools/src/py/qpid-config @@ -174,7 +174,8 @@ def OptionsAndArguments(argv): group1 = OptionGroup(parser, "General Options") 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("-b", "--broker", action="store", type="string", 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", metavar="<address>") 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 +246,9 @@ def OptionsAndArguments(argv): config._recursive = True if opts.broker: config._host = opts.broker + if opts.broker_addr: + config._host = opts.broker_addr + if config._host is None: config._host="localhost:5672" if opts.timeout is not None: config._connTimeout = opts.timeout if config._connTimeout == 0: @@ -313,7 +317,9 @@ def OptionsAndArguments(argv): if opts.ssl_certificate: conn_options['ssl_certfile'] = opts.ssl_certificate if opts.ssl_key: - conn_options['ssl_key'] = opts.ssl_key + if not opts.ssl_certificate: + parser.error("missing '--ssl-certificate' (required by '--ssl-key')") + conn_options['ssl_keyfile'] = opts.ssl_key if opts.ha_admin: conn_options['client_properties'] = {'qpid.ha-admin' : 1} |