alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

main: Setup logging before wlc_init.

Browse source 
If `wlc_init` fails the error message will never be logged or printed
anywhere.
This commit is contained in:
S. Christoffer Eliesen 2015-11-29 14:56:33 +01:00
parent 01c5349e1a
commit c26a4b42cf
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sway/main.c
View file

@ -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); setenv("WLC_DIM", "0", 0);
wlc_log_set_handler(wlc_log_handler); wlc_log_set_handler(wlc_log_handler);
detect_nvidia(); detect_nvidia();
@ -119,14 +127,6 @@ int main(int argc, char **argv) {
} }
register_extensions(); 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 #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); sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH);
#endif #endif