X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=conf_files.py;h=f3d1eb9902a4d78d423ec60fd9319a6acce65f9f;hb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;hp=fc90da226b05db884dd5b3172b93df99c83753ff;hpb=658683174ea538f4cacdab54302882005e148b8f;p=nodemanager.git

diff --git a/conf_files.py b/conf_files.py
index fc90da2..f3d1eb9 100644
--- a/conf_files.py
+++ b/conf_files.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 """configuration files"""
 
 import grp
@@ -53,14 +56,9 @@ class conf_files:
             else:                url += '?'
             url += "node_id=%d"%tools.node_id()
         else:
-            logger.log('%s -- WARNING, cannot add node_id to request'%dest)
-        # pass slicefamily as well, as stored in /etc/planetlab/slicefamily ont the node
-        if tools.slicefamily():
-            if url.find('?') >0: url += '&'
-            else:                url += '?'
-            url += "slicefamily=%s"%tools.slicefamily()
+            logger.log('conf_files: %s -- WARNING, cannot add node_id to request'%dest)
         try:
-            logger.verbose("retrieving URL=%s"%url)
+            logger.verbose("conf_files: retrieving URL=%s"%url)
             contents = curlwrapper.retrieve(url, self.config.cacert)
         except xmlrpclib.ProtocolError,e:
             logger.log('conf_files: failed to retrieve %s from %s, skipping' % (dest, url))
@@ -80,13 +78,14 @@ class conf_files:
         if data.has_key("conf_files"):
             for f in data['conf_files']:
                 try: self.update_conf_file(f)
-                except: logger.log_exc()
-        else: logger.log("conf_files:  No conf_files found or API failure.  Skipping")
+                except: logger.log_exc("conf_files: failed to update conf_file")
+        else: 
+            logger.log_missing_data("conf_files.run_once",'conf_files')
 
 
 def start(options, config): pass
 
-def GetSlivers(data, plc = None, config = None):
+def GetSlivers(data, config = None, plc = None):
     logger.log("conf_files: Running.")
     cf = conf_files()
     cf.run_once(data)