From: Brian Warner <warner@allmydata.com>
Date: Tue, 20 Nov 2007 21:22:26 +0000 (-0700)
Subject: introducer_and_vdrive.py: use logpublisher too
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/?a=commitdiff_plain;h=d3e782a226ddbf7c311f25a183df5f4341096ba5;p=tahoe-lafs%2Ftahoe-lafs.git

introducer_and_vdrive.py: use logpublisher too
---

diff --git a/src/allmydata/introducer.py b/src/allmydata/introducer.py
index 86015e00..7b601140 100644
--- a/src/allmydata/introducer.py
+++ b/src/allmydata/introducer.py
@@ -16,6 +16,24 @@ class IntroducerNode(node.Node):
     DEFAULT_K, DEFAULT_DESIRED, DEFAULT_N = 3, 7, 10
 
     def tub_ready(self):
+        i = Introducer()
+        r = self.add_service(i)
+        self.urls["introducer"] = self.tub.registerReference(r, "introducer")
+        self.log(" introducer is at %s" % self.urls["introducer"])
+        self.write_config("introducer.furl", self.urls["introducer"] + "\n")
+
+        vdrive_dir = os.path.join(self.basedir, self.VDRIVEDIR)
+        vds = self.add_service(VirtualDriveServer(vdrive_dir))
+        vds_furl = self.tub.registerReference(vds, "vdrive")
+        vds.set_furl(vds_furl)
+        self.urls["vdrive"] = vds_furl
+        self.log(" vdrive is at %s" % self.urls["vdrive"])
+        self.write_config("vdrive.furl", self.urls["vdrive"] + "\n")
+
+        encoding_parameters = self._read_encoding_parameters()
+        i.set_encoding_parameters(encoding_parameters)
+
+    def _read_encoding_parameters(self):
         k, desired, n = self.DEFAULT_K, self.DEFAULT_DESIRED, self.DEFAULT_N
         data = self.get_config("encoding_parameters")
         if data is not None:
@@ -85,7 +103,7 @@ class IntroducerClient(service.Service, Referenceable):
         self.introducer_reconnector = self.tub.connectTo(self.introducer_furl,
                                                          self._got_introducer)
         def connect_failed(failure):
-            self.log("\n\nInitial Introducer connection failed: "
+            self.log("\n\nInitial IntroducerAndVdrive connection failed: "
                      "perhaps it's down\n")
             self.log(str(failure))
         d = self.tub.getReference(self.introducer_furl)
diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index ff1345c2..6bf1e028 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -286,6 +286,9 @@ class Node(service.MultiService):
 
     def tub_ready(self):
         # called when the Tub is available for registerReference
+        self.setup_log_publisher()
+
+    def setup_log_publisher(self):
         self.add_service(LogPublisher())
         log_gatherer_furl = self.get_config("log_gatherer.furl")
         if log_gatherer_furl: