Ticket #8: autodiscovery5

diff --git a/pydra_server/cluster/master/auto_discovery.py b/pydra_server/cluster/master/auto_discovery.py
index edd230e..76b7437 100644
--- a/pydra_server/cluster/master/auto_discovery.py
+++ b/pydra_server/cluster/master/auto_discovery.py
@@ -21,7 +21,7 @@ from dbus.mainloop.glib import DBusGMainLoop
 import dbus, avahi
 
 from pydra_server.cluster.module import Module
-from pydra_server.models import pydraSettings
+from pydra_server.models import pydraSettings, Node
 
 # init logging
 import logging
@@ -61,7 +61,7 @@ class AutoDiscoveryModule(Module):
 
                 # add the node (without the restart)
                 Node.objects.create(host=args[7], port=args[8])
-                self.connect()
+                self.emit('NODE_ADDED')
             else:
                 self.known_nodes.add((args[7], args[8]))
 
@@ -94,11 +94,11 @@ class AutoDiscoveryModule(Module):
         sbrowser.connect_to_signal("ItemNew", node_found)
 
 
-    def list_known_nodes(self, _):
+    def list_known_nodes(self):
         """
         list know_nodes
         """
         # cast to list, doesn't seem to digest set
-        return list(self.master.known_nodes)
+        return list(self.known_nodes)
 
 
diff --git a/pydra_server/cluster/master/node_connection_manager.py b/pydra_server/cluster/master/node_connection_manager.py
index 10c6fbc..da48276 100644
--- a/pydra_server/cluster/master/node_connection_manager.py
+++ b/pydra_server/cluster/master/node_connection_manager.py
@@ -86,6 +86,7 @@ class NodeConnectionManager(Module):
 
         self._listeners = {
             'MANAGER_INIT':self.connect,
+            'NODE_ADDED':self.connect, #trigger the reconnection procedure when a node is added
             'NODE_CREATED':self.connect_node,
             'NODE_UPDATED':self.connect_node,
         }
@@ -151,7 +152,7 @@ class NodeConnectionManager(Module):
                 if i.id not in self.nodes:
                     self.nodes[i.id] = i
                 if (i.host, i.port) in self.known_nodes:
-                    self.known_nodes.discard((i.host, i.port))
+                    self.manager.get_shared('known_nodes').discard((i.host, i.port))
 
             logger.info("Connecting to nodes")
             connections = []