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

diff --git a/conf_files.py b/conf_files.py
index fd926a5..f3d1eb9 100644
--- a/conf_files.py
+++ b/conf_files.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 """configuration files"""
 
 import grp
@@ -5,18 +8,17 @@ import os
 import pwd
 import sha
 import string
-import threading
 
 import curlwrapper
 import logger
 import tools
 import xmlrpclib
+from config import Config 
 
 class conf_files:
-    def __init__(self, config, noscripts=False):
-        self.config = config
+    def __init__(self, noscripts=False):
+        self.config = Config()
         self.noscripts = noscripts
-        self.cond = threading.Condition()
         self.data = None
 
     def checksum(self, path):
@@ -54,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))
@@ -78,37 +75,21 @@ class conf_files:
         if self.system(cf_rec['postinstall_cmd']): self.system(err_cmd)
 
     def run_once(self, data):
-        for f in data['conf_files']:
-            try: self.update_conf_file(f)
-            except: logger.log_exc()
-
-    def run(self):
-        while True:
-            self.cond.acquire()
-            while self.data == None: self.cond.wait()
-            data = self.data
-            self.data = None
-            self.cond.release()
-            self.run_once(data)
-
-    def callback(self, data):
-        if data != None:
-            self.cond.acquire()
-            self.data = data
-            self.cond.notify()
-            self.cond.release()
-
-main = None
-
-def start(options, config):
-    global main
-    main = conf_files(config)
-    tools.as_daemon_thread(main.run)
-
-def GetSlivers(data):
-    global main
-    assert main is not None
-    return main.callback(data)
+        if data.has_key("conf_files"):
+            for f in data['conf_files']:
+                try: self.update_conf_file(f)
+                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, config = None, plc = None):
+    logger.log("conf_files: Running.")
+    cf = conf_files()
+    cf.run_once(data)
+    logger.log("conf_files: Done.")
 
 if __name__ == '__main__':
     import optparse
@@ -119,7 +100,6 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args()
 
     # Load /etc/planetlab/plc_config
-    from config import Config
     config = Config(options.config)
 
     # Load /etc/planetlab/session
@@ -132,6 +112,6 @@ if __name__ == '__main__':
     from plcapi import PLCAPI
     plc = PLCAPI(config.plc_api_uri, config.cacert, auth = session)
 
-    main = conf_files(config, options.noscripts)
+    main = conf_files(options.noscripts)
     data = plc.GetSlivers()
     main.run_once(data)