From 7196f59db0698a4d31ee99763a1f43a7e53f95cc Mon Sep 17 00:00:00 2001 From: Calvin Lee Date: Sun, 31 Dec 2017 14:32:28 -0700 Subject: Consolidate WLR and Sway logging See #1390 --- sway/server.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'sway/server.c') diff --git a/sway/server.c b/sway/server.c index 32c8f03c..365094ef 100644 --- a/sway/server.c +++ b/sway/server.c @@ -10,12 +10,12 @@ #include // TODO WLR: make Xwayland optional #include +#include #include "sway/server.h" #include "sway/input/input-manager.h" -#include "log.h" bool server_init(struct sway_server *server) { - sway_log(L_DEBUG, "Initializing Wayland server"); + wlr_log(L_DEBUG, "Initializing Wayland server"); server->wl_display = wl_display_create(); server->wl_event_loop = wl_display_get_event_loop(server->wl_display); @@ -55,7 +55,8 @@ bool server_init(struct sway_server *server) { server->wl_shell_surface.notify = handle_wl_shell_surface; server->socket = wl_display_add_socket_auto(server->wl_display); - if (!sway_assert(server->socket, "Unable to open wayland socket")) { + if (!server->socket) { + wlr_log(L_ERROR, "Unable to open wayland socket"); wlr_backend_destroy(server->backend); return false; } @@ -71,11 +72,11 @@ void server_fini(struct sway_server *server) { } void server_run(struct sway_server *server) { - sway_log(L_INFO, "Running compositor on wayland display '%s'", + wlr_log(L_INFO, "Running compositor on wayland display '%s'", server->socket); setenv("_WAYLAND_DISPLAY", server->socket, true); - if (!sway_assert(wlr_backend_start(server->backend), - "Failed to start backend")) { + if (!wlr_backend_start(server->backend)) { + wlr_log(L_ERROR, "Failed to start backend"); wlr_backend_destroy(server->backend); return; } -- cgit v1.2.3