Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E2101E06D for ; Thu, 14 Mar 2013 19:41:45 +0000 (UTC) Received: (qmail 86101 invoked by uid 500); 14 Mar 2013 19:41:43 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 86065 invoked by uid 500); 14 Mar 2013 19:41:43 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 86009 invoked by uid 99); 14 Mar 2013 19:41:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Mar 2013 19:41:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0659016E6B; Thu, 14 Mar 2013 19:41:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chipchilders@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: refs/heads/4.1 - Summary: Fix exception handling in security_group.py Message-Id: <20130314194143.0659016E6B@tyr.zones.apache.org> Date: Thu, 14 Mar 2013 19:41:43 +0000 (UTC) Summary: Fix exception handling in security_group.py Detail: Code was attempting to concatinate an exception to a string. Updated to convert to text and concatinate that. BUG-ID: CLOUDSTACK-1052 Bugfix-for: master Reported-by: Noa Resare Signed-off-by: John Kinsella 1363218769 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/beb6170d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/beb6170d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/beb6170d Branch: refs/heads/4.1 Commit: beb6170d2a5994edc2524c74751e7cf44843e98b Parents: 6928679 Author: John Kinsella Authored: Wed Mar 13 16:52:49 2013 -0700 Committer: Chip Childers Committed: Thu Mar 14 15:40:24 2013 -0400 ---------------------------------------------------------------------- scripts/vm/network/security_group.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/beb6170d/scripts/vm/network/security_group.py ---------------------------------------------------------------------- diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index ed4180a..50a1641 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -25,6 +25,8 @@ import os import xml.dom.minidom from optparse import OptionParser, OptionGroup, OptParseError, BadOptionError, OptionError, OptionConflictError, OptionValueError import re +import traceback + iptables = Command("iptables") bash = Command("/bin/bash") virsh = Command("virsh") @@ -692,7 +694,8 @@ def add_network_rules(vm_name, vm_id, vm_ip, signature, seqno, vmMac, rules, vif return 'true' except: - logging.debug("Failed to network rule !: " + sys.exc_type) + exceptionText = traceback.format_exc() + logging.debug("Failed to network rule !: " + exceptionText) def getVifs(vmName): vifs = []