Commits

Adam Lindsay  committed fe02df0

Joining is more self-serve, pulling the data. May be able to dispense with 'join' command altogether.

  • Participants
  • Parent commits 8aedcaf

Comments (0)

Files changed (1)

         self.add(location, [self.location])
         ping_until_return(location)
         items = self.ring.nodes.difference([loc2str(location)])
-        for item in items:
-            remote_call(location, 'add', str2loc(item), map(str2loc, self.ring.nodes))
+        # for item in items:
+        #     remote_call(location, 'add', str2loc(item), map(str2loc, self.ring.nodes))
     
     def remove(self, location, authorities):
         """
     def local_join(self):
         self.ring.append(self.here)
         if self.peer:
+            self.ring.extend(map(loc2str, remote_call(self.peer, 'get_all')))
             remote_call(self.peer, 'join', self.location)
             print 'Joining the network...'
         else: