Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6ECB9F9DA for ; Thu, 2 May 2013 10:08:26 +0000 (UTC) Received: (qmail 3460 invoked by uid 500); 2 May 2013 10:08:26 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 3367 invoked by uid 500); 2 May 2013 10:08:25 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 3327 invoked by uid 99); 2 May 2013 10:08:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 10:08:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 10:08:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0359D23888E7; Thu, 2 May 2013 10:08:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1478311 - /qpid/trunk/qpid/tools/src/py/qpid-config Date: Thu, 02 May 2013 10:08:00 -0000 To: commits@qpid.apache.org From: jross@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130502100801.0359D23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jross Date: Thu May 2 10:08:00 2013 New Revision: 1478311 URL: http://svn.apache.org/r1478311 Log: QPID-4806: Suppress traceback when access denied; 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=1478311&r1=1478310&r2=1478311&view=diff ============================================================================== --- qpid/trunk/qpid/tools/src/py/qpid-config (original) +++ qpid/trunk/qpid/tools/src/py/qpid-config Thu May 2 10:08:00 2013 @@ -377,9 +377,20 @@ class BrokerManager: self.conn = Connection.establish(self.url, **conn_options) self.broker = BrokerAgent(self.conn) - def Disconnect(self): + def Disconnect(self, ignore=True): if self.conn: - self.conn.close() + try: + self.conn.close() + except Exception, e: + if ignore: + # suppress close errors to avoid + # tracebacks when a previous + # exception will be printed to stdout + pass + else: + # raise last exception so complete + # trackback is preserved + raise def Overview(self): exchanges = self.broker.getAllExchanges() @@ -770,7 +781,7 @@ def main(argv=None): # some commands take longer than the default amqp timeout to complete, # so attempt to disconnect until successful, ignoring Timeouts try: - bm.Disconnect() + bm.Disconnect(ignore=False) break except Exception, e: if e.__class__.__name__ != "Timeout": --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org