X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=b9be84ceadf7b8e7e58f7e9557efe528b0ea25a8;hb=a0cd2ac59b891751067512dce77cf6223104932f;hp=1020e4fed98ac03d0981d80d517e68abf6e3a76f;hpb=5d72d5880a6bd319a8ce2bf7dd2e4921938c77c2;p=paraslash.git

diff --git a/server.c b/server.c
index 1020e4fe..b9be84ce 100644
--- a/server.c
+++ b/server.c
@@ -205,7 +205,7 @@ void parse_config_or_die(bool reload)
 			para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	if (OPT_GIVEN(LOGFILE)) {
 		daemon_set_logfile(OPT_STRING_VAL(LOGFILE));
 		daemon_open_log_or_die();
@@ -543,7 +543,7 @@ static void server_init(int argc, char **argv, struct server_command_task *sct)
 	if (ret < 0)
 		goto fail;
 	server_lpr = cmdline_lpr;
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	daemon_drop_privileges_or_die(OPT_STRING_VAL(USER),
 		OPT_STRING_VAL(GROUP));
 	version_handle_flag("server", OPT_GIVEN(VERSION));
@@ -679,12 +679,13 @@ int main(int argc, char *argv[])
 		deplete_close_on_fork_list();
 		if (ret < 0)
 			PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+		vss_shutdown();
 	} else {
+		vss_shutdown();
 		alarm(ALARM_TIMEOUT);
 		close_listed_fds();
 		ret = handle_connect(sct->child_fd);
 	}
-	vss_shutdown();
 	shm_detach(mmd);
 	user_list_deplete();
 	free_lpr();