From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 29 Oct 2015 20:53:36 +0000 (+0000)
Subject: Turn off bridging to Twisted log, and pin to Twisted 15.2.0.
X-Git-Url: https://git.rkrishnan.org/specifications/%5B/%5D%20/uri/nxhtml.html?a=commitdiff_plain;h=eb4f07ffb79be2c13e5f9a4b82042a25bfc9c6d6;p=tahoe-lafs%2Ftahoe-lafs.git

Turn off bridging to Twisted log, and pin to Twisted 15.2.0.
Hopefully this will avoid http://foolscap.lothar.com/trac/ticket/244 .

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 86a3314b..1a6c735e 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -37,7 +37,8 @@ install_requires = [
     #   filepath.Permissions
     # * Nevow 0.11.1 depends on Twisted >= 13.0.0.
     # * The Magic Folder frontend depends on Twisted >= 15.2.0.
-    "Twisted >= 15.2.0",
+    # * For now we pin Twisted 15.2.0 to avoid <http://foolscap.lothar.com/trac/ticket/244>.
+    "Twisted == 15.2.0",
 
     # Nevow 0.11.1 can be installed using pip (#2032).
     "Nevow >= 0.11.1",
diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index 35ccb355..b10c790d 100644
--- 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)
+        self.tub.setOption("bridge-twisted-logs", False)
         incident_dir = os.path.join(self.basedir, "logs", "incidents")
         foolscap.logging.log.setLogDir(incident_dir.encode(get_filesystem_encoding()))