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>
This commit is contained in:
Daira Hopwood 2015-10-29 20:53:36 +00:00
parent 6da832cf14
commit eb4f07ffb7
2 changed files with 3 additions and 2 deletions

View File

@ -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",

View File

@ -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()))