cross-module change for 4.2

[nodemanager.git] / conf_files.py

diff --git a/conf_files.py b/conf_files.py
index c5d5924..64e18c2 100644 (file)
--- a/conf_files.py
+++ b/conf_files.py
@@ -10,7 +10,7 @@ import threading
 import curlwrapper
 import logger
 import tools
-
+import xmlrpclib
 
 class conf_files:
     def __init__(self, config, noscripts=False):
@@ -19,6 +19,17 @@ class conf_files:
         self.cond = threading.Condition()
         self.data = None
 
+    # get node_id from /etc/planetlab/node_id and cache it
+    _node_id=None
+    @staticmethod 
+    def node_id():
+        if conf_files._node_id is None:
+            try:
+                conf_files._node_id=int(file("/etc/planetlab/node_id").read())
+            except:
+                conf_files._node_id=""
+        return conf_files._node_id
+
     def checksum(self, path):
         try:
             f = open(path)
@@ -50,9 +61,15 @@ class conf_files:
             logger.log('conf_files: cannot find group %s -- %s not updated'%(cf_rec['file_group'],dest))
             return
         url = 'https://%s/%s' % (self.config.PLC_BOOT_HOST, cf_rec['source'])
+        # set node_id at the end of the request - hacky
+        if conf_files.node_id():
+            if url.find('?') >0: url += '&'
+            else:                url += '?'
+            url += "node_id=%d"%conf_files.node_id()
         try:
+            logger.log("retrieving URL=%s"%url)
             contents = curlwrapper.retrieve(url, self.config.cacert)
-        except curlwrapper.CurlException:
+        except xmlrpclib.ProtocolError,e:
             logger.log('conf_files: failed to retrieve %s from %s, skipping' % (dest, url))
             return
         if not cf_rec['always_update'] and sha.new(contents).digest() == self.checksum(dest):