|
 |
9334368 |
From 8b0a7a0c8dd7df477c3408298aa1f7126799da65 Mon Sep 17 00:00:00 2001
|
|
|
9334368 |
From: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
9334368 |
Date: Tue, 17 May 2016 12:13:00 +0200
|
|
|
9334368 |
Subject: [PATCH] a-dump-journal-xorg: add '_COMM=gnome-shell' to journal
|
|
|
9334368 |
filter
|
|
|
9334368 |
|
|
|
9334368 |
'/usr/bin/Xwayland' crashes from gnome-shell are logged to journal with
|
|
|
9334368 |
'_COMM=gnome-shell'.
|
|
|
9334368 |
|
|
|
9334368 |
In case ABRT cannot get executable from journal backtrace (path to binary file
|
|
|
9334368 |
containting substring "bin/X") the default one /usr/bin/X(org) is used instead.
|
|
|
9334368 |
It means if wayland crashes and /usr/bin/Xwayland is not mentioned in
|
|
|
9334368 |
backtrace, the executable is /usr/bin/X(org) even it is a wayland crash.
|
|
|
9334368 |
|
|
|
9334368 |
Tried to figure out how to find out if it is a wayland or xorg crash with
|
|
|
9334368 |
wayland guys on irc and they said there is no easy and reasonable way how to
|
|
|
9334368 |
achieve this.
|
|
|
9334368 |
|
|
|
9334368 |
Because the /usr/bin/Xwayland and the /usr/bin/Xorg executable are placed under
|
|
|
9334368 |
the same xorg-x11-server bugzilla component I decided no to change the default
|
|
|
9334368 |
executable. Also all wayland backtraces I've seen contained /usr/bin/Xwayland
|
|
|
9334368 |
executable so the right executable was used.
|
|
|
9334368 |
|
|
|
9334368 |
Related to: #1336618
|
|
|
9334368 |
|
|
|
9334368 |
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
9334368 |
---
|
|
|
9334368 |
src/plugins/xorg-utils.c | 2 +-
|
|
|
9334368 |
src/plugins/xorg.conf | 2 +-
|
|
|
9334368 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
9334368 |
|
|
|
9334368 |
diff --git a/src/plugins/xorg-utils.c b/src/plugins/xorg-utils.c
|
|
|
9334368 |
index 8f121f8..6039acd 100644
|
|
|
9334368 |
--- a/src/plugins/xorg-utils.c
|
|
|
9334368 |
+++ b/src/plugins/xorg-utils.c
|
|
|
9334368 |
@@ -21,7 +21,7 @@
|
|
|
9334368 |
*/
|
|
|
9334368 |
#define IGNORE_RESULT(func_call) do { if (func_call) /* nothing */; } while (0)
|
|
|
9334368 |
|
|
|
9334368 |
-#define DEFAULT_XORG_CRASH_REASON "Xorg server crashed"
|
|
|
9334368 |
+#define DEFAULT_XORG_CRASH_REASON "Display server crashed"
|
|
|
9334368 |
|
|
|
9334368 |
int abrt_xorg_signaled_sleep(int seconds)
|
|
|
9334368 |
{
|
|
|
9334368 |
diff --git a/src/plugins/xorg.conf b/src/plugins/xorg.conf
|
|
|
9334368 |
index 28f3ee1..8834e23 100644
|
|
|
9334368 |
--- a/src/plugins/xorg.conf
|
|
|
9334368 |
+++ b/src/plugins/xorg.conf
|
|
|
9334368 |
@@ -4,4 +4,4 @@
|
|
|
9334368 |
BlacklistedXorgModules = nvidia, fglrx, vboxvideo
|
|
|
9334368 |
|
|
|
9334368 |
# List of filters which is used for searching Xorg crashes in jounral
|
|
|
9334368 |
-JournalFilters = _COMM=gdm-x-session
|
|
|
9334368 |
+JournalFilters = _COMM=gdm-x-session, _COMM=gnome-shell
|
|
|
9334368 |
--
|
|
|
9334368 |
2.7.4
|
|
|
9334368 |
|