diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
| commit | 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 (patch) | |
| tree | 2a890e1df09e5b896a9b4168a7b22648f559a1f2 /tools/src/py/qpid-printevents | |
| parent | 172d9b2a16cfb817bbe632d050acba7e31401cd2 (diff) | |
| download | qpid-python-asyncstore.tar.gz | |
Update from trunk r1375509 through r1450773asyncstore
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tools/src/py/qpid-printevents')
| -rwxr-xr-x | tools/src/py/qpid-printevents | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/src/py/qpid-printevents b/tools/src/py/qpid-printevents index 0d0f1a0782..71b5854f03 100755 --- a/tools/src/py/qpid-printevents +++ b/tools/src/py/qpid-printevents @@ -72,7 +72,7 @@ class EventReceiver(Thread): isOpen = False while self.running: try: - conn = Connection.establish(self.url, **options) + conn = Connection.establish(self.url, **self.options) isOpen = True self.printer.pr(strftime("%c", gmtime(time())) + " NOTIC qpid-printevents:brokerConnected broker=%s" % self.url) @@ -150,7 +150,9 @@ def main(argv=None): if options.ssl_certificate: conn_options['ssl_certfile'] = options.ssl_certificate if options.ssl_key: - conn_options['ssl_key'] = options.ssl_key + if not options.ssl_certificate: + p.error("missing '--ssl-certificate' (required by '--ssl-key')") + conn_options['ssl_keyfile'] = options.ssl_key if options.ha_admin: props['qpid.ha-admin'] = 1 if options.heartbeats: |