Disable bridging of foolscap logging to the Twisted log, and remove docs for it....

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / node.py

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index c20fef3e0ad8cf4348d170a77cfcf77fd447c7dc..98ce3cb7c539aacec662488446ade79ea599747b 100644 (file)
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -381,7 +381,7 @@ class Node(service.MultiService):
             self.tub.setOption("log-gatherer-furl", lgfurl)
         self.tub.setOption("log-gatherer-furlfile",
                            os.path.join(self.basedir, "log_gatherer.furl"))
-        self.tub.setOption("bridge-twisted-logs", True)
+
         incident_dir = os.path.join(self.basedir, "logs", "incidents")
         foolscap.logging.log.setLogDir(incident_dir.encode(get_filesystem_encoding()))
 
@@ -404,7 +404,9 @@ class Node(service.MultiService):
         if "AUTO" in split_location:
             d = iputil.get_local_addresses_async()
             def _add_local(local_addresses):
-                split_location.remove("AUTO")
+                while "AUTO" in split_location:
+                    split_location.remove("AUTO")
+
                 split_location.extend([ "%s:%d" % (addr, portnum)
                                         for addr in local_addresses ])
                 return ",".join(split_location)