Use symbolic names for loglevels and clean up the ggo mess.

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index c11fb58a9cc234ee6316b3850b758b96286a65a7..4822ebb5c3066404e46f72b8154acc6f452bde04 100644 (file)
--- a/server.c
+++ b/server.c
@@ -202,7 +202,7 @@ err_out:
 void parse_config_or_die(int override)
 {
        char *home = para_homedir();
-       int ret, ll = conf.loglevel_arg;
+       int ret;
        char *cf;
 
        daemon_close_log();
@@ -237,7 +237,7 @@ void parse_config_or_die(int override)
                daemon_set_logfile(conf.logfile_arg);
                daemon_open_log_or_die();
        }
-       daemon_set_loglevel(ll);
+       daemon_set_loglevel(conf.loglevel_arg);
        init_colors_or_die();
        daemon_set_flag(DF_LOG_PID);
        daemon_set_flag(DF_LOG_LL);
@@ -491,7 +491,7 @@ static void server_init(int argc, char **argv)
        drop_privileges_or_die(conf.user_arg, conf.group_arg);
        /* parse config file, open log and set defaults */
        parse_config_or_die(0);
-       log_welcome("para_server", conf.loglevel_arg);
+       log_welcome("para_server");
        init_ipc_or_die(); /* init mmd struct and mmd->lock */
        /* make sure, the global now pointer is uptodate */
        gettimeofday(now, NULL);