blind and brutal 2to3

[nodemanager.git] / plugins / syndicate.py

diff --git a/plugins/syndicate.py b/plugins/syndicate.py
index 04462be..4a9d4de 100644 (file)
--- a/plugins/syndicate.py
+++ b/plugins/syndicate.py
@@ -2,7 +2,7 @@
 
 """ Syndicate configurator.  """
 
-import httplib
+import http.client
 import os
 import shutil
 import tools
@@ -21,7 +21,7 @@ def syndicate_op(op, mountpoint, syndicate_ip):
     logger.log("Syndicate: Http op %s on url %s to host %s" % (op, mountpoint, syndicate_ip))
 
     try:
-        conn = httplib.HTTPSConnection(syndicate_ip, timeout=60)
+        conn = http.client.HTTPSConnection(syndicate_ip, timeout=60)
         conn.request(op, mountpoint)
         r1 = conn.getresponse()
     except:
@@ -56,12 +56,22 @@ def disable_syndicate_mount(sliver, mountpoint, syndicate_ip):
 def GetSlivers(data, conf = None, plc = None):
     node_id = tools.node_id()
 
+    if 'slivers' not in data:
+        logger.log_missing_data("syndicate.GetSlivers", 'slivers')
+        return
+
+    syndicate_sliver = None
+    for sliver in data['slivers']:
+        if sliver['name'] == "princeton_syndicate":
+            syndicate_sliver = sliver
+
+    if not syndicate_sliver:
+        logger.log("Syndicate: no princeton_syndicate sliver on this node. aborting.")
+        return
+
     syndicate_ip = tools.get_sliver_ip("princeton_syndicate")
     if not syndicate_ip:
         logger.log("Syndicate: unable to get syndicate sliver ip. aborting.")
-
-    if 'slivers' not in data:
-        logger.log_missing_data("syndicate.GetSlivers",'slivers')
         return
 
     for sliver in data['slivers']: