Skip to content

L
lxc
Unverified Commit 8ee2f36f by Christian Brauner
Options

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: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 86deb111
Showing with 0 additions and 19 deletions
src/lxc/cmd/lxc_monitord.c
...@@ -339,13 +339,11 @@ static void lxc_monitord_sig_handler(int sig) ...@@ -339,13 +339,11 @@ static void lxc_monitord_sig_handler(int sig)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int ret, pipefd = -1; int ret, pipefd = -1;
char logpath[PATH_MAX];
sigset_t mask; sigset_t mask;
const char *lxcpath = NULL; const char *lxcpath = NULL;
bool mainloop_opened = false; bool mainloop_opened = false;
bool monitord_created = false; bool monitord_created = false;
bool persistent = false; bool persistent = false;
struct lxc_log log;
if (argc > 1 && !strcmp(argv[1], "--daemon")) { if (argc > 1 && !strcmp(argv[1], "--daemon")) {
persistent = true; persistent = true;
...@@ -381,23 +379,6 @@ int main(int argc, char *argv[]) ...@@ -381,23 +379,6 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE); 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) || if (sigfillset(&mask) ||
sigdelset(&mask, SIGILL) || sigdelset(&mask, SIGILL) ||
sigdelset(&mask, SIGSEGV) || sigdelset(&mask, SIGSEGV) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment