X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=6192ba1cc08cccd35613dce692d71b55c774d530;hb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;hp=8c04760fd384521f766474a6a3ab27a95c32265a;hpb=1cb0bbb1b6f7e998769011ff47c31f8e4cf63169;p=nodemanager.git diff --git a/sm.py b/sm.py index 8c04760..6192ba1 100644 --- a/sm.py +++ b/sm.py @@ -63,16 +63,16 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): in, use the GetSlivers() heartbeat as a cue to scan for expired slivers.""" - logger.verbose("Entering sm:GetSlivers with fullupdate=%r"%fullupdate) + logger.verbose("sm: Entering GetSlivers with fullupdate=%r"%fullupdate) for key in data.keys(): - logger.verbose('GetSlivers key : ' + key) + logger.verbose('sm: GetSlivers key : ' + key) node_id = None try: f = open('/etc/planetlab/node_id') try: node_id = int(f.read()) finally: f.close() - except: logger.log_exc("sm.GetSlivers failed to read /etc/planetlab/node_id") + 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 @@ -87,11 +87,11 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True): return initscripts = {} for is_rec in data['initscripts']: - logger.verbose("initscript: %s" % is_rec['name']) + logger.verbose("sm: initscript: %s" % is_rec['name']) initscripts[str(is_rec['name'])] = is_rec['script'] for sliver in data['slivers']: - logger.verbose("%s: sm:GetSlivers in slivers loop"%sliver['name']) + logger.verbose("sm: %s: sm:GetSlivers in slivers loop"%sliver['name']) rec = sliver.copy() rec.setdefault('timestamp', data['timestamp'])