From: Daira Hopwood Date: Tue, 3 Nov 2015 17:35:21 +0000 (+0000) Subject: Disable bridging of foolscap logging to the Twisted log, and remove docs for it.... X-Git-Url: https://git.rkrishnan.org/simplejson/encoder.py.html?a=commitdiff_plain;h=913082230ca648a40776befd6b17acfea74da60c;p=tahoe-lafs%2Ftahoe-lafs.git Disable bridging of foolscap logging to the Twisted log, and remove docs for it. fixes ticket:2567 Signed-off-by: Daira Hopwood --- diff --git a/docs/logging.rst b/docs/logging.rst index 4672e8f9..8d01557a 100644 --- a/docs/logging.rst +++ b/docs/logging.rst @@ -198,23 +198,6 @@ the outbound TCP queue), publishing nodes will start dropping log events when the outbound queue grows too large. When this occurs, there will be gaps (non-sequential event numbers) in the log-gatherer's flogfiles. -Local twistd.log files -====================== - -[TODO: not yet true, requires foolscap-0.3.1 and a change to ``allmydata.node``] - -In addition to the foolscap-based event logs, certain high-level events will -be recorded directly in human-readable text form, in the -``BASEDIR/logs/twistd.log`` file (and its rotated old versions: -``twistd.log.1``, ``twistd.log.2``, etc). This form does not contain as much -information as the flogfiles available through the means described -previously, but they are immediately available to the curious developer, and -are retained until the twistd.log.NN files are explicitly deleted. - -Only events at the ``log.OPERATIONAL`` level or higher are bridged to -``twistd.log`` (i.e. not the ``log.NOISY`` debugging events). In addition, -foolscap internal events (like connection negotiation messages) are not -bridged to ``twistd.log``. Adding log messages =================== diff --git a/src/allmydata/node.py b/src/allmydata/node.py index 35ccb355..98ce3cb7 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) + incident_dir = os.path.join(self.basedir, "logs", "incidents") foolscap.logging.log.setLogDir(incident_dir.encode(get_filesystem_encoding()))