54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From 5b150e8c9bd99cf5026a06999be4273b2d53188d Mon Sep 17 00:00:00 2001
|
|
From: Ray Strode <rstrode@redhat.com>
|
|
Date: Wed, 6 May 2020 13:45:50 -0400
|
|
Subject: [PATCH] main: only log check-accelerated errors when debugging
|
|
enabled
|
|
|
|
The journal currently gets spammed with messages like:
|
|
|
|
gnome-session: gnome-session-check-accelerated: GL Helper exited with code 512
|
|
gnome-session: libEGL warning: DRI2: failed to authenticate
|
|
gnome-session: gnome-session-check-accelerated: GLES Helper exited with code 512
|
|
|
|
if a the machine lacks accelerated graphics. But lacking accelerated
|
|
graphics isn't actually an error (many servers do).
|
|
|
|
This commit changes the messages to only show when debugging is enabled.
|
|
---
|
|
gnome-session/main.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/gnome-session/main.c b/gnome-session/main.c
|
|
index 384ffee7..57091a54 100644
|
|
--- a/gnome-session/main.c
|
|
+++ b/gnome-session/main.c
|
|
@@ -233,6 +233,8 @@ static gboolean
|
|
check_gl (GError **error)
|
|
{
|
|
int status;
|
|
+ g_autofree char *error_output = NULL;
|
|
+
|
|
char *argv[] = { LIBEXECDIR "/gnome-session-check-accelerated", NULL };
|
|
|
|
if (getenv ("DISPLAY") == NULL) {
|
|
@@ -240,11 +242,15 @@ check_gl (GError **error)
|
|
return TRUE;
|
|
}
|
|
|
|
- if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &gl_renderer, NULL,
|
|
+ if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &gl_renderer, &error_output,
|
|
&status, error)) {
|
|
return FALSE;
|
|
}
|
|
|
|
+ if (error_output != NULL) {
|
|
+ g_debug ("%s", error_output);
|
|
+ }
|
|
+
|
|
#if GLIB_CHECK_VERSION(2, 70, 0)
|
|
return g_spawn_check_wait_status (status, error);
|
|
#else
|
|
--
|
|
2.49.0
|
|
|