From 40071f3cb698a7106eea2334b194c8897c2b6935 Mon Sep 17 00:00:00 2001 From: peterbppb <91122533+peterbppb@users.noreply.github.com> Date: Mon, 11 Mar 2024 10:22:48 +0200 Subject: [PATCH 1/3] custom output should account for the current verbosity level Signed-off-by: peterbppb <91122533+peterbppb@users.noreply.github.com> --- logbasecommand/base.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/logbasecommand/base.py b/logbasecommand/base.py index f92c7eb..38ce567 100644 --- a/logbasecommand/base.py +++ b/logbasecommand/base.py @@ -33,15 +33,18 @@ def log_debug(self, msg, *args, **kwargs): return self.logger.debug(msg, *args, **kwargs) def log(self, msg, *args, **kwargs): - self.__custom_stdout(msg, *args) + if self.logger.level <= logging.INFO: + self.__custom_stdout(msg, *args) return self.logger.info(msg, *args, **kwargs) def log_warning(self, msg, *args, **kwargs): - self.__custom_stderr(msg, *args) + if self.logger.level <= logging.WARNING: + self.__custom_stderr(msg, *args) return self.logger.warning(msg, *args, **kwargs) def log_error(self, msg, *args, **kwargs): - self.__custom_stderr(msg, *args) + if self.logger.level <= logging.ERROR: + self.__custom_stderr(msg, *args) return self.logger.error(msg, *args, **kwargs) def log_exception(self, msg, *args, **kwargs): From 1382c7f9adb2ef4a54827e26b64806f9d269c7b3 Mon Sep 17 00:00:00 2001 From: Gustavo Silva Date: Mon, 11 Mar 2024 14:02:21 +0000 Subject: [PATCH 2/3] fixup: fmt --- logbasecommand/__init__.py | 2 +- logbasecommand/base.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/logbasecommand/__init__.py b/logbasecommand/__init__.py index d18f409..3b93d0b 100644 --- a/logbasecommand/__init__.py +++ b/logbasecommand/__init__.py @@ -1 +1 @@ -__version__ = '0.0.2' +__version__ = "0.0.2" diff --git a/logbasecommand/base.py b/logbasecommand/base.py index 38ce567..237e835 100644 --- a/logbasecommand/base.py +++ b/logbasecommand/base.py @@ -14,8 +14,8 @@ class LogBaseCommand(BaseCommand): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - prefix = getattr(settings, 'LOGBASECOMMAND_PREFIX', None) or __name__ - self.logger = logging.getLogger(prefix + '.' + self.__module__.split('.')[-1]) + prefix = getattr(settings, "LOGBASECOMMAND_PREFIX", None) or __name__ + self.logger = logging.getLogger(prefix + "." + self.__module__.split(".")[-1]) def __handle_custom_std(self, ifstd, std, msg, *args): if ifstd: @@ -52,16 +52,19 @@ def log_exception(self, msg, *args, **kwargs): return self.logger.exception(msg, *args, **kwargs) def execute(self, *args, **options): - self.verbosity = options['verbosity'] + self.verbosity = options["verbosity"] self.logger.setLevel( - [logging.ERROR, max(self.logger.getEffectiveLevel(), logging.INFO), logging.DEBUG, logging.DEBUG][ - self.verbosity - ] + [ + logging.ERROR, + max(self.logger.getEffectiveLevel(), logging.INFO), + logging.DEBUG, + logging.DEBUG, + ][self.verbosity] ) - if options.get('stdout') is not None: + if options.get("stdout") is not None: self.custom_stdout = True - if options.get('stderr') is not None: + if options.get("stderr") is not None: self.custom_stderr = True super().execute(*args, **options) From 61a86962ab02878424c8cff4bcac737e4e1280a6 Mon Sep 17 00:00:00 2001 From: Bogdan Peter Date: Wed, 13 Mar 2024 14:21:29 +0200 Subject: [PATCH 3/3] reset --- logbasecommand/__init__.py | 2 +- testapp/testapp/urls.py | 3 ++- testapp/tests/test_command.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/logbasecommand/__init__.py b/logbasecommand/__init__.py index 3b93d0b..27fdca4 100644 --- a/logbasecommand/__init__.py +++ b/logbasecommand/__init__.py @@ -1 +1 @@ -__version__ = "0.0.2" +__version__ = "0.0.3" diff --git a/testapp/testapp/urls.py b/testapp/testapp/urls.py index 8ab3632..ab2af97 100644 --- a/testapp/testapp/urls.py +++ b/testapp/testapp/urls.py @@ -13,9 +13,10 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path urlpatterns = [ - path('admin/', admin.site.urls), + path("admin/", admin.site.urls), ] diff --git a/testapp/tests/test_command.py b/testapp/tests/test_command.py index 6e6e38b..c30bef3 100644 --- a/testapp/tests/test_command.py +++ b/testapp/tests/test_command.py @@ -25,5 +25,5 @@ def test_silent(self): out = StringIO() err = StringIO() call_command('some_command', verbosity=0, stdout=out, stderr=err) - self.assertEqual(out.getvalue(), 'info message\n') + self.assertEqual(out.getvalue(), '') self.assertEqual(err.getvalue(), 'error message\nexception handled\n')