xserver: Create per-display log file
authorKristian Høgsberg <krh@bitplanet.net>
Sat, 16 Jul 2011 00:14:00 +0000 (20:14 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Sat, 16 Jul 2011 00:14:00 +0000 (20:14 -0400)
compositor/xserver-launcher.c

index fff3146..61ffc09 100644 (file)
@@ -453,7 +453,7 @@ static int
 wlsc_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
 {
        struct wlsc_xserver *mxs = data;
-       char display[8], s[8];
+       char display[8], s[8], logfile[32];
        int sv[2], flags;
 
        if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) {
@@ -474,6 +474,8 @@ wlsc_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
                setenv("WAYLAND_SOCKET", s, 1);
 
                snprintf(display, sizeof display, ":%d", mxs->display);
+               snprintf(logfile, sizeof logfile,
+                        "/tmp/x-log-%d", mxs->display);
 
                if (execl("/usr/bin/Xorg",
                          "/usr/bin/Xorg",
@@ -481,7 +483,7 @@ wlsc_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
                          "-wayland",
                          "-rootless",
                          "-retro",
-                         "-logfile", "/tmp/foo",
+                         "-logfile", logfile,
                          "-nolisten", "all",
                          "-terminate",
                          NULL) < 0)