From: Brian Warner Date: Tue, 25 Dec 2007 00:24:40 +0000 (-0700) Subject: node.py: remove the provoke-logport-furlfile-creation hack now that foolscap-0.2... X-Git-Tag: allmydata-tahoe-0.7.0~75 X-Git-Url: https://git.rkrishnan.org/pf/content//%22%3C?a=commitdiff_plain;h=4ce196a9c4e48d07a9eb0cbbcd611f114c8cb003;p=tahoe-lafs%2Ftahoe-lafs.git node.py: remove the provoke-logport-furlfile-creation hack now that foolscap-0.2.3 does it for us, and add bridge-twisted-logs --- diff --git a/src/allmydata/node.py b/src/allmydata/node.py index 1a0a8113..0d82777b 100644 --- a/src/allmydata/node.py +++ b/src/allmydata/node.py @@ -206,10 +206,7 @@ class Node(service.MultiService): os.path.join(self.basedir, "private","logport.furl")) self.tub.setOption("log-gatherer-furlfile", os.path.join(self.basedir, "log_gatherer.furl")) - # provoke foolscap into registering the logport when it can, so that - # the 'logport.furl' file will be available for people to use - # 'flogtool tail'. - self.when_tub_ready().addCallback(lambda res: self.tub.getLogPortFURL()) + self.tub.setOption("bridge-twisted-logs", True) def log(self, msg, src="", args=(), **kw): if src: