From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 3 May 2021 06:57:39 +0000 (+0200)
Subject: lxc_monitord: remove monitord log
X-Git-Tag: lxc-5.0.0~183^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ee2f36fc35966028823b15731c975ac644a108d;p=thirdparty%2Flxc.git

lxc_monitord: remove monitord log

The tool is effectively unused with current master so removing the log
should be ok by now. Let's remove the log to avoid issues such as #3747.

Fixes #3747
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c
index da7db2820..f0d6d4622 100644
--- a/src/lxc/cmd/lxc_monitord.c
+++ b/src/lxc/cmd/lxc_monitord.c
@@ -339,13 +339,11 @@ static void lxc_monitord_sig_handler(int sig)
 int main(int argc, char *argv[])
 {
 	int ret, pipefd = -1;
-	char logpath[PATH_MAX];
 	sigset_t mask;
 	const char *lxcpath = NULL;
 	bool mainloop_opened = false;
 	bool monitord_created = false;
 	bool persistent = false;
-	struct lxc_log log;
 
 	if (argc > 1 && !strcmp(argv[1], "--daemon")) {
 		persistent = true;
@@ -381,23 +379,6 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 
-	ret = snprintf(logpath, sizeof(logpath), "%s/lxc-monitord.log",
-		       (strcmp(LXCPATH, lxcpath) ? lxcpath : LOGPATH));
-	if (ret < 0 || ret >= sizeof(logpath))
-		exit(EXIT_FAILURE);
-
-	log.name = NULL;
-	log.file = logpath;
-	log.level = "DEBUG";
-	log.prefix = "lxc-monitord";
-	log.quiet = 0;
-	log.lxcpath = lxcpath;
-
-	ret = lxc_log_init(&log);
-	if (ret)
-		INFO("Failed to open log file %s, log will be lost", lxcpath);
-	lxc_log_options_no_override();
-
 	if (sigfillset(&mask) ||
 	    sigdelset(&mask, SIGILL)  ||
 	    sigdelset(&mask, SIGSEGV) ||