log: journal: fix forgotten syslog reload when flipped from journal

Signed-off-by: Jan Pokorný <[email protected]>
ClusterLabs · May 4, 2020 · 803d924 · 803d924
1 parent 2baa279
commit 803d924
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/ipc_socket.c b/lib/ipc_socket.c
@@ -108,8 +108,8 @@ qb_ipc_dgram_sock_setup(const char *base_name,
 		   sizeof(local_address));
 
 	if (use_filesystem_sockets()) {
-		chmod(local_address.sun_path, 0660);
-		chown(local_address.sun_path, -1, gid);
+		(void)chmod(local_address.sun_path, 0660);
+		(void)chown(local_address.sun_path, -1, gid);
 	}
 	if (res < 0) {
 		goto error_connect;

diff --git a/lib/log.c b/lib/log.c
@@ -1103,6 +1103,7 @@ qb_log_ctl2(int32_t t, enum qb_log_conf c, qb_log_ctl2_arg_t arg_not4directuse)
 #ifdef USE_JOURNAL
 		if (t == QB_LOG_SYSLOG) {
 			conf[t].use_journal = arg_i32;
+			need_reload = QB_TRUE;
 		} else {
 			rc = -EINVAL;
 		}

diff --git a/lib/log_syslog.c b/lib/log_syslog.c
@@ -97,8 +97,8 @@ _syslog_reload(int32_t target)
 {
 	struct qb_log_target *t = qb_log_target_get(target);
 
+	closelog();
 	if (!t->use_journal) {
-		closelog();
 		openlog(t->name, LOG_PID, t->facility);
 	}
 }