From 55f14f2531afdaedff83c9ece69989e84aba7eea Mon Sep 17 00:00:00 2001 From: zwimer Date: Mon, 14 Oct 2024 15:44:20 -0400 Subject: [PATCH] Reduce log spam in release mode --- rpipe/__init__.py | 2 +- rpipe/server/app.py | 8 +++++--- rpipe/server/channel/channel.py | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/rpipe/__init__.py b/rpipe/__init__.py index 35939c6..8c8632d 100644 --- a/rpipe/__init__.py +++ b/rpipe/__init__.py @@ -1 +1 @@ -__version__: str = "9.0.5" # Must be "..", all numbers +__version__: str = "9.0.6" # Must be "..", all numbers diff --git a/rpipe/server/app.py b/rpipe/server/app.py index e6ed1b9..dbbf319 100644 --- a/rpipe/server/app.py +++ b/rpipe/server/app.py @@ -1,5 +1,5 @@ from __future__ import annotations -from logging import StreamHandler, FileHandler, Formatter, getLevelName, getLogger, shutdown +from logging import DEBUG, INFO, StreamHandler, FileHandler, Formatter, getLevelName, getLogger, shutdown from os import environ, close as fd_close from dataclasses import dataclass from tempfile import mkstemp @@ -29,10 +29,12 @@ def _logged(func): @wraps(func) def wrapper(*args, **kwargs): ret = func(*args, **kwargs) - if not server.debug: # Flask already does what we want + if not server.debug: # Flask in debug mode already does what we want if (fp := request.full_path).endswith("?"): fp = fp[:-1] - getLogger(_LOG).info('%s - "%s %s" %d', request.remote_addr, request.method, fp, ret.status_code) + lvl = DEBUG if (ret.status_code < 300 or ret.status_code == 425) else INFO + args = (request.remote_addr, request.method, fp, ret.status_code) + getLogger(_LOG).log(lvl, '%s - "%s %s" %d', *args) return ret return wrapper diff --git a/rpipe/server/channel/channel.py b/rpipe/server/channel/channel.py index c72174e..275b8d1 100644 --- a/rpipe/server/channel/channel.py +++ b/rpipe/server/channel/channel.py @@ -5,7 +5,7 @@ from flask import request -from ...shared import QueryEC +from ...shared import TRACE, QueryEC from ..util import plaintext, json_response from ..server import ServerShutdown from .write import write @@ -41,17 +41,17 @@ def _handler(state: State, channel: str) -> Response: def handler(state: State, channel: str) -> Response: log = getLogger("channel") - log.info("Invoking: %s %s", request.method, channel) + log.debug("Invoking: %s %s", request.method, channel) ret = _handler(state, channel) - log.info("Sending: %s", ret) - if ret.status_code >= 400: - log.debug(" body: %s", ret.get_data()) + if ret.status_code >= 300: + log.debug("Sending: %s", ret) + log.log(TRACE, "Body: %s", ret.get_data()) return ret def query(state: State, channel: str) -> Response: log = getLogger("query") - log.info("Query %s", channel) + log.debug("Query %s", channel) with state as u: if (s := u.streams.get(channel, None)) is None: log.debug("Channel not found: %s", channel)