Merge branch 't/unix_path_max_fix'

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 5fec70b63517f352386d0990cb9b7e797a2429dc..15ae5c9a296be654471fd1f95aa9395629fae097 100644 (file)
--- a/server.c
+++ b/server.c
@@ -491,7 +491,7 @@ static void server_init(int argc, char **argv)
        init_ipc_or_die(); /* init mmd struct and mmd->lock */
        /* make sure, the global now pointer is uptodate */
        gettimeofday(now, NULL);
-       server_uptime(UPTIME_SET); /* reset server uptime */
+       set_server_start_time(now);
        init_user_list(user_list_file);
        /* become daemon */
        if (conf.daemon_given)
@@ -525,7 +525,7 @@ static void server_init(int argc, char **argv)
 static void status_refresh(void)
 {
        static int prev_uptime = -1, prev_events = -1;
-       int uptime = server_uptime(UPTIME_GET);
+       int uptime = get_server_uptime(now);
 
        if (prev_events != mmd->events)
                goto out;