summaryrefslogtreecommitdiff
path: root/src/wayland/meta-xwayland.c
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2018-04-12 14:06:01 -0400
committerRay Strode <rstrode@redhat.com>2018-04-17 11:09:49 -0400
commit32da4661dac91a32f55df884ce1312ba0988f7f8 (patch)
tree04a5cf38488ee1ef16d3d5acc76e9b6ad69a3822 /src/wayland/meta-xwayland.c
parent2692218fed7574c466e0adf54d55830b9712d1f1 (diff)
downloadmutter-32da4661dac91a32f55df884ce1312ba0988f7f8.tar.gz
xwayland: Don't abort if Xwayland crasheswip/halfline/silence-x-io-errors
Right now if Xwayland crashes, we crash, too. On some level that makes sense, since we're supposed to control the lifecycle of Xwayland, and by it crashing we've lost that control. But practically speaking, the knock-on crash adds noise to the logs, bug trackers, and retrace servers that only makes debugging harder. And the crash isn't something mutter can "fix", since it's ultimately from a bug in Xwayland anyway. This commit makes mutter exit instead of crash if Xwayland goes away unexpectedly.
Diffstat (limited to 'src/wayland/meta-xwayland.c')
-rw-r--r--src/wayland/meta-xwayland.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 774997611..c3baaff05 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -26,6 +26,8 @@
#include "meta-xwayland.h"
#include "meta-xwayland-private.h"
+#include <meta/main.h>
+
#include <glib.h>
#include <glib-unix.h>
#include <errno.h>
@@ -397,25 +399,30 @@ xserver_died (GObject *source,
if (!g_subprocess_wait_finish (proc, result, &error))
{
- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- g_error ("Failed to finish waiting for Xwayland: %s", error->message);
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ return;
+
+ g_warning ("Failed to finish waiting for Xwayland: %s", error->message);
}
else if (!g_subprocess_get_successful (proc))
- g_error ("X Wayland crashed; aborting");
+ g_warning ("X Wayland crashed; exiting");
else
{
/* For now we simply abort if we see the server exit.
*
* In the future X will only be loaded lazily for legacy X support
* but for now it's a hard requirement. */
- g_error ("Spurious exit of X Wayland server");
+ g_warning ("Spurious exit of X Wayland server");
}
+
+ meta_exit (META_EXIT_ERROR);
}
static int
x_io_error (Display *display)
{
- g_error ("Connection to xwayland lost");
+ g_warning ("Connection to xwayland lost");
+ meta_exit (META_EXIT_ERROR);
return 0;
}