Blob Blame History Raw
From 8b0a7a0c8dd7df477c3408298aa1f7126799da65 Mon Sep 17 00:00:00 2001
From: Matej Habrnal <mhabrnal@redhat.com>
Date: Tue, 17 May 2016 12:13:00 +0200
Subject: [PATCH] a-dump-journal-xorg: add '_COMM=gnome-shell' to journal
 filter

'/usr/bin/Xwayland' crashes from gnome-shell are logged to journal with
'_COMM=gnome-shell'.

In case ABRT cannot get executable from journal backtrace (path to binary file
containting substring "bin/X") the default one /usr/bin/X(org) is used instead.
It means if wayland crashes and /usr/bin/Xwayland is not mentioned in
backtrace, the executable is /usr/bin/X(org) even it is a wayland crash.

Tried to figure out how to find out if it is a wayland or xorg crash with
wayland guys on irc and they said there is no easy and reasonable way how to
achieve this.

Because the /usr/bin/Xwayland and the /usr/bin/Xorg executable are placed under
the same xorg-x11-server bugzilla component I decided no to change the default
executable. Also all wayland backtraces I've seen contained /usr/bin/Xwayland
executable so the right executable was used.

Related to: #1336618

Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
---
 src/plugins/xorg-utils.c | 2 +-
 src/plugins/xorg.conf    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/xorg-utils.c b/src/plugins/xorg-utils.c
index 8f121f8..6039acd 100644
--- a/src/plugins/xorg-utils.c
+++ b/src/plugins/xorg-utils.c
@@ -21,7 +21,7 @@
  */
 #define IGNORE_RESULT(func_call) do { if (func_call) /* nothing */; } while (0)
 
-#define DEFAULT_XORG_CRASH_REASON "Xorg server crashed"
+#define DEFAULT_XORG_CRASH_REASON "Display server crashed"
 
 int abrt_xorg_signaled_sleep(int seconds)
 {
diff --git a/src/plugins/xorg.conf b/src/plugins/xorg.conf
index 28f3ee1..8834e23 100644
--- a/src/plugins/xorg.conf
+++ b/src/plugins/xorg.conf
@@ -4,4 +4,4 @@
 BlacklistedXorgModules = nvidia, fglrx, vboxvideo
 
 # List of filters which is used for searching Xorg crashes in jounral
-JournalFilters = _COMM=gdm-x-session
+JournalFilters = _COMM=gdm-x-session, _COMM=gnome-shell
-- 
2.7.4