X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=31d29c73dc5595c881173abe4eea892854b1f6a3;hp=f3d5237f19cfbc69e01ca17851f698fda1b41779;hb=b01605d7062e4d1f005d5aaaaed158d8efe06d79;hpb=d46a0767b58654f15f16406cf99296287bd0d534

diff --git a/server.c b/server.c
index f3d5237f..31d29c73 100644
--- a/server.c
+++ b/server.c
@@ -236,13 +236,13 @@ void parse_config_or_die(int override)
 			.print_errors = !conf.daemon_given
 		};
 		server_cmdline_parser_config_file(cf, &conf, &params);
+		daemon_set_loglevel(conf.loglevel_arg);
 		conf.daemon_given = tmp;
 	}
 	if (conf.logfile_given) {
 		daemon_set_logfile(conf.logfile_arg);
 		daemon_open_log_or_die();
 	}
-	daemon_set_loglevel(conf.loglevel_arg);
 	init_colors_or_die();
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
@@ -490,6 +490,7 @@ static void server_init(int argc, char **argv)
 	server_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("server", conf);
 	drop_privileges_or_die(conf.user_arg, conf.group_arg);
+	daemon_set_loglevel(conf.loglevel_arg);
 	/* parse config file, open log and set defaults */
 	parse_config_or_die(0);
 	log_welcome("para_server");