From 44176c6a8cbff6c6eda3bbcbe90e87a68e94a17d Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 25 Jan 2021 14:02:48 +0200 Subject: [PATCH] Lower default severity of logging categories Warning messages are not the kind of messages that should be ignored, they indicate that something is off or wrong. Also, this makes triaging bugs easier as we no longer have to ask people to run kwin with the QT_LOGGING_RULES environment variable set. --- autotests/libinput/context_test.cpp | 2 +- data/org_kde_kwin.categories | 44 +++++++++---------- decorations/decorations_logging.cpp | 2 +- effects/logging.cpp | 2 +- libinput/libinput_logging.cpp | 2 +- libkwineffects/logging.cpp | 6 +-- main_x11.cpp | 2 +- .../aurorae/src/lib/auroraetheme.cpp | 2 +- plugins/platforms/drm/logging.cpp | 2 +- plugins/platforms/fbdev/logging.cpp | 2 +- plugins/platforms/wayland/logging.cpp | 2 +- .../platforms/x11/common/eglonxbackend.cpp | 2 +- plugins/platforms/x11/standalone/logging.cpp | 2 +- plugins/platforms/x11/windowed/logging.cpp | 2 +- scripting/scripting_logging.cpp | 2 +- tabbox/tabbox_logging.cpp | 2 +- utils.cpp | 4 +- xkb.cpp | 2 +- 18 files changed, 42 insertions(+), 42 deletions(-) diff --git a/autotests/libinput/context_test.cpp b/autotests/libinput/context_test.cpp index 0c5839bb53..fbb1f56fb5 100644 --- a/autotests/libinput/context_test.cpp +++ b/autotests/libinput/context_test.cpp @@ -11,7 +11,7 @@ #include "../../libinput/context.h" #include "../../udev.h" #include -Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtWarningMsg) using namespace KWin; using namespace KWin::LibInput; diff --git a/data/org_kde_kwin.categories b/data/org_kde_kwin.categories index b603d3fbf6..4f3428e740 100644 --- a/data/org_kde_kwin.categories +++ b/data/org_kde_kwin.categories @@ -1,24 +1,24 @@ -kwin_core KWin Core DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_CORE] -kwin_utils KWin utils DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_UTILS] -kwin_virtualkeyboard KWin Virtual Keyboard Integration DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_VIRTUALKEYBOARD] -kwineffects KWin Effects DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWINEFFECTS] -libkwineffects KWin Effects Library DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [LIBKWINEFFECTS] -libkwinglutils KWin OpenGL utility Library DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [LIBKWINGLUTILS] -libkwinxrenderutils KWin XRender utility Library DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [LIBKWINXRENDERUTILS] -kwin_wayland_drm KWin Wayland (DRM backend) DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_DRM] -kwin_wayland_framebuffer KWin Wayland (Framebuffer backend) DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_FB] -kwin_wayland_backend KWin Wayland (Wayland backend) DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_WAYLAND_BACKEND] -kwin_wayland_x11windowed KWin Wayland (X11 backend) DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_X11WINDOWED] -kwin_platform_x11_standalone KWin X11 Standalone Platform DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_X11STANDALONE] -kwin_libinput KWin Libinput Integration DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_LIBINPUT] -kwin_tabbox KWin Window Switcher DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_TABBOX] -kwin_decorations KWin Decorations DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_DECORATIONS] -kwin_scripting KWin Scripting DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_SCRIPTING] -aurorae KWin Aurorae Window Decoration Engine DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [AURORAE] -kwin_xkbcommon KWin xkbcommon integration DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_XKB] -kwin_qpa_plugin KWin QtPlatformAbstraction plugin DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_QPA] -kwin_scene_xrender KWin XRender based compositor scene plugin DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_XRENDER] -kwin_scene_qpainter KWin QPainter based compositor scene plugin DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_QPAINTER] -kwin_scene_opengl KWin OpenGL based compositor scene plugins DEFAULT_SEVERITY [CRITICAL] IDENTIFIER [KWIN_OPENGL] +kwin_core KWin Core DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_CORE] +kwin_utils KWin utils DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_UTILS] +kwin_virtualkeyboard KWin Virtual Keyboard Integration DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_VIRTUALKEYBOARD] +kwineffects KWin Effects DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWINEFFECTS] +libkwineffects KWin Effects Library DEFAULT_SEVERITY [WARNING] IDENTIFIER [LIBKWINEFFECTS] +libkwinglutils KWin OpenGL utility Library DEFAULT_SEVERITY [WARNING] IDENTIFIER [LIBKWINGLUTILS] +libkwinxrenderutils KWin XRender utility Library DEFAULT_SEVERITY [WARNING] IDENTIFIER [LIBKWINXRENDERUTILS] +kwin_wayland_drm KWin Wayland (DRM backend) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_DRM] +kwin_wayland_framebuffer KWin Wayland (Framebuffer backend) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_FB] +kwin_wayland_backend KWin Wayland (Wayland backend) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_WAYLAND_BACKEND] +kwin_wayland_x11windowed KWin Wayland (X11 backend) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_X11WINDOWED] +kwin_platform_x11_standalone KWin X11 Standalone Platform DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_X11STANDALONE] +kwin_libinput KWin Libinput Integration DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_LIBINPUT] +kwin_tabbox KWin Window Switcher DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_TABBOX] +kwin_decorations KWin Decorations DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_DECORATIONS] +kwin_scripting KWin Scripting DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_SCRIPTING] +aurorae KWin Aurorae Window Decoration Engine DEFAULT_SEVERITY [WARNING] IDENTIFIER [AURORAE] +kwin_xkbcommon KWin xkbcommon integration DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_XKB] +kwin_qpa_plugin KWin QtPlatformAbstraction plugin DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_QPA] +kwin_scene_xrender KWin XRender based compositor scene plugin DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_XRENDER] +kwin_scene_qpainter KWin QPainter based compositor scene plugin DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_QPAINTER] +kwin_scene_opengl KWin OpenGL based compositor scene plugins DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_OPENGL] kwin_screencast KWin Screen Cast Service DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_SCREENCAST] kwin_xwl KWin Xwayland Server DEFAULT_SEVERITY [WARNING] IDENTIFIER [KWIN_XWL] diff --git a/decorations/decorations_logging.cpp b/decorations/decorations_logging.cpp index 180ca4944d..9f49bcda75 100644 --- a/decorations/decorations_logging.cpp +++ b/decorations/decorations_logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "decorations_logging.h" -Q_LOGGING_CATEGORY(KWIN_DECORATIONS, "kwin_decorations", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_DECORATIONS, "kwin_decorations", QtWarningMsg) diff --git a/effects/logging.cpp b/effects/logging.cpp index 78f5b3576e..1a578ffa40 100644 --- a/effects/logging.cpp +++ b/effects/logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include -Q_LOGGING_CATEGORY(KWINEFFECTS, "kwineffects", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWINEFFECTS, "kwineffects", QtWarningMsg) diff --git a/libinput/libinput_logging.cpp b/libinput/libinput_logging.cpp index bc76abd062..fd660c97fa 100644 --- a/libinput/libinput_logging.cpp +++ b/libinput/libinput_logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "libinput_logging.h" -Q_LOGGING_CATEGORY(KWIN_LIBINPUT, "kwin_libinput", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_LIBINPUT, "kwin_libinput", QtWarningMsg) diff --git a/libkwineffects/logging.cpp b/libkwineffects/logging.cpp index 8fb308acdd..eb7d5eabb2 100644 --- a/libkwineffects/logging.cpp +++ b/libkwineffects/logging.cpp @@ -7,6 +7,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "logging_p.h" -Q_LOGGING_CATEGORY(LIBKWINEFFECTS, "libkwineffects", QtCriticalMsg) -Q_LOGGING_CATEGORY(LIBKWINGLUTILS, "libkwinglutils", QtCriticalMsg) -Q_LOGGING_CATEGORY(LIBKWINXRENDERUTILS, "libkwinxrenderutils", QtCriticalMsg) +Q_LOGGING_CATEGORY(LIBKWINEFFECTS, "libkwineffects", QtWarningMsg) +Q_LOGGING_CATEGORY(LIBKWINGLUTILS, "libkwinglutils", QtWarningMsg) +Q_LOGGING_CATEGORY(LIBKWINXRENDERUTILS, "libkwinxrenderutils", QtWarningMsg) diff --git a/main_x11.cpp b/main_x11.cpp index 78ae744e07..48eb5e2ee8 100644 --- a/main_x11.cpp +++ b/main_x11.cpp @@ -44,7 +44,7 @@ #endif // HAVE_UNISTD_H #include -Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtWarningMsg) namespace KWin { diff --git a/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp b/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp index 989791e417..4020ca9dc1 100644 --- a/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp +++ b/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp @@ -16,7 +16,7 @@ #include #include -Q_LOGGING_CATEGORY(AURORAE, "aurorae", QtCriticalMsg) +Q_LOGGING_CATEGORY(AURORAE, "aurorae", QtWarningMsg) namespace Aurorae { diff --git a/plugins/platforms/drm/logging.cpp b/plugins/platforms/drm/logging.cpp index 20102dcf51..b4f66c7ab6 100644 --- a/plugins/platforms/drm/logging.cpp +++ b/plugins/platforms/drm/logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "logging.h" -Q_LOGGING_CATEGORY(KWIN_DRM, "kwin_wayland_drm", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_DRM, "kwin_wayland_drm", QtWarningMsg) diff --git a/plugins/platforms/fbdev/logging.cpp b/plugins/platforms/fbdev/logging.cpp index 467e898284..5990a66a12 100644 --- a/plugins/platforms/fbdev/logging.cpp +++ b/plugins/platforms/fbdev/logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "logging.h" -Q_LOGGING_CATEGORY(KWIN_FB, "kwin_wayland_framebuffer", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_FB, "kwin_wayland_framebuffer", QtWarningMsg) diff --git a/plugins/platforms/wayland/logging.cpp b/plugins/platforms/wayland/logging.cpp index a5c80a17c7..cdbff07e48 100644 --- a/plugins/platforms/wayland/logging.cpp +++ b/plugins/platforms/wayland/logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "logging.h" -Q_LOGGING_CATEGORY(KWIN_WAYLAND_BACKEND, "kwin_wayland_backend", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_WAYLAND_BACKEND, "kwin_wayland_backend", QtWarningMsg) diff --git a/plugins/platforms/x11/common/eglonxbackend.cpp b/plugins/platforms/x11/common/eglonxbackend.cpp index eb675e83d4..ea2ec63804 100644 --- a/plugins/platforms/x11/common/eglonxbackend.cpp +++ b/plugins/platforms/x11/common/eglonxbackend.cpp @@ -17,7 +17,7 @@ #include #include -Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtWarningMsg) namespace KWin { diff --git a/plugins/platforms/x11/standalone/logging.cpp b/plugins/platforms/x11/standalone/logging.cpp index 9eaeeb86e0..21a1c984dd 100644 --- a/plugins/platforms/x11/standalone/logging.cpp +++ b/plugins/platforms/x11/standalone/logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "logging.h" -Q_LOGGING_CATEGORY(KWIN_X11STANDALONE, "kwin_platform_x11_standalone", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_X11STANDALONE, "kwin_platform_x11_standalone", QtWarningMsg) diff --git a/plugins/platforms/x11/windowed/logging.cpp b/plugins/platforms/x11/windowed/logging.cpp index 939dc0b5c7..05bc9c7bbe 100644 --- a/plugins/platforms/x11/windowed/logging.cpp +++ b/plugins/platforms/x11/windowed/logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "logging.h" -Q_LOGGING_CATEGORY(KWIN_X11WINDOWED, "kwin_wayland_x11windowed", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_X11WINDOWED, "kwin_wayland_x11windowed", QtWarningMsg) diff --git a/scripting/scripting_logging.cpp b/scripting/scripting_logging.cpp index c61400d615..2f1a8a4215 100644 --- a/scripting/scripting_logging.cpp +++ b/scripting/scripting_logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "scripting_logging.h" -Q_LOGGING_CATEGORY(KWIN_SCRIPTING, "kwin_scripting", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_SCRIPTING, "kwin_scripting", QtWarningMsg) diff --git a/tabbox/tabbox_logging.cpp b/tabbox/tabbox_logging.cpp index c3e37b4fa7..006b8e88cd 100644 --- a/tabbox/tabbox_logging.cpp +++ b/tabbox/tabbox_logging.cpp @@ -7,4 +7,4 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "tabbox_logging.h" -Q_LOGGING_CATEGORY(KWIN_TABBOX, "kwin_tabbox", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_TABBOX, "kwin_tabbox", QtWarningMsg) diff --git a/utils.cpp b/utils.cpp index abf215b601..adc45ddd86 100644 --- a/utils.cpp +++ b/utils.cpp @@ -32,8 +32,8 @@ #endif -Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg) -Q_LOGGING_CATEGORY(KWIN_VIRTUALKEYBOARD, "kwin_virtualkeyboard", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtWarningMsg) +Q_LOGGING_CATEGORY(KWIN_VIRTUALKEYBOARD, "kwin_virtualkeyboard", QtWarningMsg) namespace KWin { diff --git a/xkb.cpp b/xkb.cpp index c7f3e35ab2..77b3626faa 100644 --- a/xkb.cpp +++ b/xkb.cpp @@ -24,7 +24,7 @@ #include #include -Q_LOGGING_CATEGORY(KWIN_XKB, "kwin_xkbcommon", QtCriticalMsg) +Q_LOGGING_CATEGORY(KWIN_XKB, "kwin_xkbcommon", QtWarningMsg) namespace KWin {