From c26a4b42cf196af3f84c8cbdd63394d021f47217 Mon Sep 17 00:00:00 2001 From: "S. Christoffer Eliesen" Date: Sun, 29 Nov 2015 14:56:33 +0100 Subject: [PATCH] main: Setup logging before wlc_init. If `wlc_init` fails the error message will never be logged or printed anywhere. --- sway/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sway/main.c b/sway/main.c index dd609214b..1a4087d3b 100644 --- a/sway/main.c +++ b/sway/main.c @@ -107,6 +107,14 @@ int main(int argc, char **argv) { } } + // we need to setup logging before wlc_init in case it fails. + if (debug) { + init_log(L_DEBUG); + } else if (verbose || validate) { + init_log(L_INFO); + } else { + init_log(L_ERROR); + } setenv("WLC_DIM", "0", 0); wlc_log_set_handler(wlc_log_handler); detect_nvidia(); @@ -119,14 +127,6 @@ int main(int argc, char **argv) { } register_extensions(); - if (debug) { - init_log(L_DEBUG); - } else if (verbose || validate) { - init_log(L_INFO); - } else { - init_log(L_ERROR); - } - #if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); #endif