BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: reinitialize logging after resets 

deinit then init the logging system after resets, because otherwise
duplicated log handlers will be added by session_init, and we will
see duplicated logs.

Doing this also enables us to add log handlers for early logging.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-11-10 19:10:32 +00:00
parent 0e5be97f94
commit 87e4e10f15
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/picom.c
View File

@ -2335,25 +2335,35 @@ int main(int argc, char **argv) {
// Main loop // Main loop
bool quit = false; bool quit = false;
int ret_code = 0;
do { do {
Display *dpy = XOpenDisplay(NULL); Display *dpy = XOpenDisplay(NULL);
if (!dpy) { if (!dpy) {
fprintf(stderr, "Can't open display."); fprintf(stderr, "Can't open display.");
return 1; ret_code = 1;
break;
} }
XSetEventQueueOwner(dpy, XCBOwnsEventQueue); XSetEventQueueOwner(dpy, XCBOwnsEventQueue);
// Reinit logging system so we don't get leftovers from previous sessions
// or early logging.
log_deinit_tls();
log_init_tls();
ps_g = session_init(argc, argv, dpy, config_file, all_xerrors, need_fork); ps_g = session_init(argc, argv, dpy, config_file, all_xerrors, need_fork);
if (!ps_g) { if (!ps_g) {
log_fatal("Failed to create new session."); log_fatal("Failed to create new session.");
return 1; ret_code = 1;
break;
} }
if (need_fork) { if (need_fork) {
// Finishing up daemonization // Finishing up daemonization
// Close files // Close files
if (fclose(stdout) || fclose(stderr) || fclose(stdin)) { if (fclose(stdout) || fclose(stderr) || fclose(stdin)) {
log_fatal("Failed to close standard input/output"); log_fatal("Failed to close standard input/output");
return 1; ret_code = 1;
break;
} }
// Make us the session and process group leader so we don't get // Make us the session and process group leader so we don't get
// killed when our parent die. // killed when our parent die.
@ -2380,5 +2390,5 @@ int main(int argc, char **argv) {
log_deinit_tls(); log_deinit_tls();
return 0; return ret_code;
} }