X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=8c04760fd384521f766474a6a3ab27a95c32265a;hb=7aa5872239d04b2d0a7cb3b00a9c14b5ea18d013;hp=841fb8f6e38569de8ab294725e28e47c6c7746d6;hpb=8a17b5db4ca3827c077401993957f703b1347369;p=nodemanager.git

diff --git a/sm.py b/sm.py
index 841fb8f..8c04760 100644
--- a/sm.py
+++ b/sm.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 """Sliver manager.
 
 The sliver manager has several functions.  It is responsible for
@@ -69,7 +72,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
         f = open('/etc/planetlab/node_id')
         try: node_id = int(f.read())
         finally: f.close()
-    except: logger.log_exc()
+    except: logger.log_exc("sm.GetSlivers failed to read /etc/planetlab/node_id")
 
     if data.has_key('node_id') and data['node_id'] != node_id: return
 
@@ -79,13 +82,16 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
                 DEFAULT_ALLOCATION['net_max_rate'] = network['bwlimit'] / 1000
 
     # Take intscripts (global) returned by API, make dict
+    if 'initscripts' not in data:
+        logger.log_missing_data("sm.GetSlivers",'initscripts')
+        return
     initscripts = {}
     for is_rec in data['initscripts']:
         logger.verbose("initscript: %s" % is_rec['name'])
         initscripts[str(is_rec['name'])] = is_rec['script']
 
     for sliver in data['slivers']:
-        logger.verbose("sm:GetSlivers in slivers loop")
+        logger.verbose("%s: sm:GetSlivers in slivers loop"%sliver['name'])
         rec = sliver.copy()
         rec.setdefault('timestamp', data['timestamp'])
 
@@ -99,7 +105,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
         rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
 
         ## 'Type' isn't returned by GetSlivers() for whatever reason.  We're overloading
-        ## instantiation here, but i suppose its the ssame thing when you think about it. -FA
+        ## instantiation here, but i suppose its the same thing when you think about it. -FA
         # Handle nm controller here
         if rec['instantiation'].lower() == 'nm-controller':
             rec.setdefault('type', attr_dict.get('type', 'controller.Controller'))