X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=15ae5c9a296be654471fd1f95aa9395629fae097;hp=142e2abb4c982457e2b51b250207e4eedeb77605;hb=63aab30b55d5809704a2d0e1c4e8de20e8228d7d;hpb=82d08fb6da4dfc7d93d1ee0cce4706721378fe12

diff --git a/server.c b/server.c
index 142e2abb..15ae5c9a 100644
--- 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), ret = 1;
+	int uptime = get_server_uptime(now);
 
 	if (prev_events != mmd->events)
 		goto out;
@@ -540,11 +540,8 @@ out:
 	prev_uptime = uptime;
 	prev_events = mmd->events;
 	mmd->vss_status_flags = mmd->new_vss_status_flags;
-	if (ret) {
-		PARA_DEBUG_LOG("%d events, forcing status update\n",
-			mmd->events);
-		killpg(0, SIGUSR1);
-	}
+	PARA_DEBUG_LOG("%d events, forcing status update\n", mmd->events);
+	killpg(0, SIGUSR1);
 }
 
 static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds,