diff --git a/lbrynet/core/log_support.py b/lbrynet/core/log_support.py index 451a57a13..880f7cd18 100644 --- a/lbrynet/core/log_support.py +++ b/lbrynet/core/log_support.py @@ -33,6 +33,7 @@ _srcfile = os.path.normcase(_srcfile) session = FuturesSession() +TRACE = 5 def bg_cb(sess, resp): @@ -371,5 +372,10 @@ class Logger(logging.Logger): callback(err, *args, **kwargs) return _fail + def trace(self, msg, *args, **kwargs): + if self.isEnabledFor(TRACE): + self._log(TRACE, msg, args, **kwargs) + logging.setLoggerClass(Logger) +logging.addLevelName(TRACE, 'TRACE') diff --git a/lbrynet/core/server/ServerProtocol.py b/lbrynet/core/server/ServerProtocol.py index df52dedb0..b88ffe0ba 100644 --- a/lbrynet/core/server/ServerProtocol.py +++ b/lbrynet/core/server/ServerProtocol.py @@ -64,7 +64,7 @@ class ServerProtocol(Protocol): self.transport.loseConnection() def write(self, data): - log.debug("Writing %s bytes of data to the transport", str(len(data))) + log.trace("Writing %s bytes of data to the transport", len(data)) self.transport.write(data) self.factory.rate_limiter.report_ul_bytes(len(data)) diff --git a/lbrynet/core/server/ServerRequestHandler.py b/lbrynet/core/server/ServerRequestHandler.py index c57a63be2..813771647 100644 --- a/lbrynet/core/server/ServerRequestHandler.py +++ b/lbrynet/core/server/ServerRequestHandler.py @@ -52,13 +52,15 @@ class ServerRequestHandler(object): from twisted.internet import reactor - if self.production_paused is False: - chunk = self.response_buff[:self.CHUNK_SIZE] - self.response_buff = self.response_buff[self.CHUNK_SIZE:] - if chunk != '': - log.debug("writing %s bytes to the client", str(len(chunk))) - self.consumer.write(chunk) - reactor.callLater(0, self._produce_more) + if self.production_paused: + return + chunk = self.response_buff[:self.CHUNK_SIZE] + self.response_buff = self.response_buff[self.CHUNK_SIZE:] + if chunk == '': + return + log.trace("writing %s bytes to the client", len(chunk)) + self.consumer.write(chunk) + reactor.callLater(0, self._produce_more) #IConsumer stuff @@ -79,7 +81,7 @@ class ServerRequestHandler(object): def get_more_data(): if self.producer is not None: - log.debug("Requesting more data from the producer") + log.trace("Requesting more data from the producer") self.producer.resumeProducing() reactor.callLater(0, get_more_data) diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb..6ce67146e 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,4 @@ +# log_support setups the default Logger class +# and so we need to ensure that it is also +# setup for the tests +from lbrynet.core import log_support