From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 15 Mar 2012 21:18:04 +0000 (-0400)
Subject: fix logging
X-Git-Tag: sfa-2.1-4~25
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=28209809ae739282a22ee4b03a09b7c1004c33e5;p=sfa.git

fix logging
---

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index b633b741..497d14fd 100644
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -190,7 +190,7 @@ class OSAggregate:
     def reserve_instance(self, image_id, kernel_id, ramdisk_id, \
                          instance_type, key_name, user_data, group_name):
         conn  = self.driver.euca_shell
-        logger.info('Reserving an instance: image: %s, kernel: ' + \
+        logger.info('Reserving an instance: image: %s, kernel: ' \
                     '%s, ramdisk: %s, type: %s, key: %s' % \
                     (image_id, kernel_id, ramdisk_id,
                     instance_type, key_name))
@@ -206,8 +206,8 @@ class OSAggregate:
                                              #min_count=min_count,
                                              #max_count=max_count,           
                                               
-        except EC2ResponseError, ec2RespError:
-            logger.log_exc(ec2RespError)
+        except Exception, err:
+            logger.log_exc(err)
                
     def run_instances(self, slicename, rspec, keyname, pubkeys):
         """