X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.h;h=d5583f580e8ec3f2af9456b564e47c13521a4af4;hp=c8dd997f97706321f98b3b6808d5e3f29e24fcf9;hb=08be831b7b7e3e55d862eb988a604ccbde603403;hpb=3cfb1d880ebf22546486316cb74cce21f007eb07

diff --git a/daemon.h b/daemon.h
index c8dd997f..d5583f58 100644
--- a/daemon.h
+++ b/daemon.h
@@ -7,15 +7,15 @@ void daemon_close_log(void);
 void log_welcome(const char *whoami);
 void drop_privileges_or_die(const char *username, const char *groupname);
 /** used for server_uptime() */
-enum uptime {UPTIME_SET, UPTIME_GET};
-time_t server_uptime(enum uptime set_or_get);
-__malloc char *uptime_str(void);
+void set_server_start_time(const struct timeval *startuptime);
+time_t get_server_uptime(const struct timeval *current_time);
+__malloc char *get_server_uptime_str(const struct timeval *current_time);
 void daemon_set_logfile(char *logfile_name);
 void daemon_set_flag(unsigned flag);
 void daemon_clear_flag(unsigned flag);
 void daemon_set_loglevel(char *loglevel);
 void daemon_set_default_log_colors(void);
-int daemon_set_log_color(char const *arg);
+void daemon_set_log_color_or_die(char const *arg);
 
 /** Daemon log configuration flags. */
 enum daemon_flags {
@@ -29,4 +29,6 @@ enum daemon_flags {
 	DF_LOG_LL = 8,
 	/** Use colored output. */
 	DF_COLOR_LOG = 16,
+	/** Include milliseconds in log output. */
+	DF_LOG_TIMING = 32
 };