File 0014-logging-Close-before-and-open-blackbox-aft... of Package corosync

Overview Repositories Revisions Requests Users Attributes Meta

File 0014-logging-Close-before-and-open-blackbox-after-fork.patch of Package corosync (Revision 06a665206db10964bc6209df2724c858)

Currently displaying revision 06a665206db10964bc6209df2724c858 , Show latest

diff --git a/exec/logsys.c b/exec/logsys.c
index a38cc5e8..8c9c222c 100644
--- a/exec/logsys.c
+++ b/exec/logsys.c
@@ -862,3 +862,19 @@ void logsys_blackbox_set(int enable)
 
 	pthread_mutex_unlock (&logsys_config_mutex);
 }
+
+/*
+ * To set correct pid to qb blackbox filename after tty dettach (fork) we have to
+ * close (this function) and (if needed) reopen blackbox (logsys_blackbox_postfork function).
+ */
+void logsys_blackbox_prefork(void)
+{
+
+	(void)qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_ENABLED, QB_FALSE);
+}
+
+void logsys_blackbox_postfork(void)
+{
+
+	_logsys_config_apply_blackbox();
+}
diff --git a/exec/main.c b/exec/main.c
index cd587dc8..426e56d0 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -1460,7 +1460,13 @@ int main (int argc, char **argv, char **envp)
 	 * Now we are fully initialized.
 	 */
 	if (background) {
+		logsys_blackbox_prefork();
+
 		corosync_tty_detach ();
+
+		logsys_blackbox_postfork();
+
+		log_printf (LOGSYS_LEVEL_DEBUG, "Corosync TTY detached");
 	}
 
 	/*
diff --git a/include/corosync/logsys.h b/include/corosync/logsys.h
index ec38d2cb..a4aad69b 100644
--- a/include/corosync/logsys.h
+++ b/include/corosync/logsys.h
@@ -258,6 +258,11 @@ extern int logsys_thread_start (void);
 
 extern void logsys_blackbox_set(int enable);
 
+extern void logsys_blackbox_prefork(void);
+
+extern void logsys_blackbox_postfork(void);
+
+
 /**
  * @brief logsys_subsys_id
  */
-- 
2.13.6

Places

File 0014-logging-Close-before-and-open-blackbox-after-fork.patch of Package corosync (Revision 06a665206db10964bc6209df2724c858)

Places