logging: Add lxc_log_options_no_override function

src/lxc/confile.c

@@ -1106,10 +1106,6 @@ static int config_loglevel(const char *key, const char *value,
 	if (!value || strlen(value) == 0)
 		return 0;
 
-	if (lxc_log_get_level() != LXC_LOG_PRIORITY_NOTSET) {
-		DEBUG("Log level already set - ignoring new value");
-		return 0;
-	}
 	if (value[0] >= '0' && value[0] <= '9')
 		newlevel = atoi(value);
 	else

src/lxc/log.c

@@ -247,6 +247,11 @@ static int __lxc_log_set_file(const char *fname, int create_dirs)
 		free(log_fname);
 	}
 
+	if (!fname || strlen(fname) == 0) {
+		log_fname = NULL;
+		return 0;
+	}
+
 #if USE_CONFIGPATH_LOGS
 	// we don't build_dir for the default if the default is
 	// i.e. /var/lib/lxc/$container/$container.log
@@ -299,7 +304,6 @@ extern int lxc_log_init(const char *name, const char *file,
 			return -1;
 		}
 
-		lxc_loglevel_specified = 1;
 		lxc_priority = lxc_log_priority_to_int(priority);
 	}
 
@@ -315,7 +319,6 @@ extern int lxc_log_init(const char *name, const char *file,
 	if (file) {
 		if (strcmp(file, "none") == 0)
 			return 0;
-		lxc_logfile_specified = 1;
 		ret = __lxc_log_set_file(file, 1);
 	} else {
 
@@ -366,15 +369,12 @@ extern int lxc_log_set_level(int level)
 		ERROR("invalid log priority %d", level);
 		return -1;
 	}
-	lxc_loglevel_specified = 1;
 	lxc_log_category_lxc.priority = level;
 	return 0;
 }
 
 extern int lxc_log_get_level(void)
 {
-	if (!lxc_loglevel_specified)
-		return LXC_LOG_PRIORITY_NOTSET;
 	return lxc_log_category_lxc.priority;
 }
 
@@ -395,7 +395,6 @@ extern int lxc_log_set_file(const char *fname)
 {
 	if (lxc_logfile_specified)
 		return 0;
-	lxc_logfile_specified = 1;
 	return __lxc_log_set_file(fname, 0);
 }
 
@@ -414,3 +413,12 @@ extern const char *lxc_log_get_prefix(void)
 {
 	return log_prefix;
 }
+
+extern void lxc_log_options_no_override()
+{
+	if (lxc_log_get_file())
+		lxc_logfile_specified = 1;
+
+	if (lxc_log_get_level() != LXC_LOG_PRIORITY_NOTSET)
+		lxc_loglevel_specified = 1;
+}

src/lxc/log.h

@@ -298,4 +298,5 @@ extern const char *lxc_log_get_file(void);
 extern int lxc_log_get_level(void);
 extern bool lxc_log_has_valid_level(void);
 extern const char *lxc_log_get_prefix(void);
+extern void lxc_log_options_no_override();
 #endif

src/lxc/lxc_attach.c

@@ -203,6 +203,7 @@ int main(int argc, char *argv[])
 			   my_args.progname, my_args.quiet, my_args.lxcpath[0]);
 	if (ret)
 		return ret;
+	lxc_log_options_no_override();
 
 	if (remount_sys_proc)
 		attach_options.attach_flags |= LXC_ATTACH_REMOUNT_PROC_SYS;

src/lxc/lxc_cgroup.c

@@ -76,6 +76,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		return -1;
+	lxc_log_options_no_override();
 
 	state_object = my_args.argv[0];
 

src/lxc/lxc_console.c

@@ -105,6 +105,7 @@ int main(int argc, char *argv[])
 			   my_args.progname, my_args.quiet, my_args.lxcpath[0]);
 	if (ret)
 		return EXIT_FAILURE;
+	lxc_log_options_no_override();
 
 	c = lxc_container_new(my_args.name, my_args.lxcpath[0]);
 	if (!c) {

src/lxc/lxc_create.c

@@ -201,6 +201,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		exit(1);
+	lxc_log_options_no_override();
 
 	memset(&spec, 0, sizeof(spec));
 	if (!my_args.bdevtype)

src/lxc/lxc_destroy.c

@@ -72,6 +72,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		exit(1);
+	lxc_log_options_no_override();
 
 	c = lxc_container_new(my_args.name, my_args.lxcpath[0]);
 	if (!c) {

src/lxc/lxc_execute.c

@@ -103,6 +103,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		return -1;
+	lxc_log_options_no_override();
 
 	/* rcfile is specified in the cli option */
 	if (my_args.rcfile)

src/lxc/lxc_freeze.c

@@ -66,6 +66,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		exit(1);
+	lxc_log_options_no_override();
 
 	c = lxc_container_new(my_args.name, my_args.lxcpath[0]);
 	if (!c) {

src/lxc/lxc_info.c

@@ -371,6 +371,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		return ret;
+	lxc_log_options_no_override();
 
 	if (print_info(my_args.name, my_args.lxcpath[0]) == 0)
 		ret = EXIT_SUCCESS;

src/lxc/lxc_init.c

@@ -111,6 +111,7 @@ int main(int argc, char *argv[])
 			   basename(argv[0]), quiet, lxcpath);
 	if (err < 0)
 		exit(EXIT_FAILURE);
+	lxc_log_options_no_override();
 
 	if (!argv[optind]) {
 		ERROR("missing command to launch");

src/lxc/lxc_monitor.c

@@ -86,6 +86,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		return -1;
+	lxc_log_options_no_override();
 
 	if (quit_monitord) {
 		int ret = EXIT_SUCCESS;

src/lxc/lxc_monitord.c

@@ -355,6 +355,7 @@ int main(int argc, char *argv[])
 	ret = lxc_log_init(NULL, logpath, "NOTICE", "lxc-monitord", 0, lxcpath);
 	if (ret)
 		INFO("Failed to open log file %s, log will be lost", lxcpath);
+	lxc_log_options_no_override();
 
 	pipefd = atoi(argv[2]);
 

src/lxc/lxc_snapshot.c

@@ -187,6 +187,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		exit(1);
+	lxc_log_options_no_override();
 
 	if (geteuid()) {
 		if (access(my_args.lxcpath[0], O_RDWR) < 0) {

src/lxc/lxc_start.c

@@ -228,6 +228,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		return err;
+	lxc_log_options_no_override();
 
 	const char *lxcpath = my_args.lxcpath[0];
 

src/lxc/lxc_stop.c

@@ -144,6 +144,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		return 1;
+	lxc_log_options_no_override();
 
 	/* Set default timeout */
 	if (my_args.timeout == -2) {

src/lxc/lxc_unfreeze.c

@@ -64,6 +64,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		exit(1);
+	lxc_log_options_no_override();
 
 	c = lxc_container_new(my_args.name, my_args.lxcpath[0]);
 	if (!c) {

src/lxc/lxc_wait.c

@@ -92,6 +92,7 @@ int main(int argc, char *argv[])
 	if (lxc_log_init(my_args.name, my_args.log_file, my_args.log_priority,
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		return -1;
+	lxc_log_options_no_override();
 
 	c = lxc_container_new(my_args.name, my_args.lxcpath[0]);
 	if (!c)

src/python-lxc/lxc/__init__.py

@@ -362,6 +362,10 @@ class Container(_lxc.Container):
         set_key(key, value)
         new_value = self.get_config_item(key)
 
+        # loglevel is special and won't match the string we set
+        if key == "lxc.loglevel":
+            new_value = value
+
         if (isinstance(value, str) and isinstance(new_value, str) and
                 value == new_value):
             return True