Merge branch 't/ssh_keys'

[paraslash.git] / daemon.h

diff --git a/daemon.h b/daemon.h
index c0a9f20c9b902fa1eb41e129663978e52a2655e7..4e803bdc4aa18df8bf124e53d1c024ed65cf2fef 100644 (file)
--- a/daemon.h
+++ b/daemon.h
@@ -4,7 +4,7 @@
 void daemonize(void);
 void daemon_open_log_or_die(void);
 void daemon_close_log(void);
-void log_welcome(const char *whoami, int loglevel);
+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};
@@ -13,9 +13,9 @@ __malloc char *uptime_str(void);
 void daemon_set_logfile(char *logfile_name);
 void daemon_set_flag(unsigned flag);
 void daemon_clear_flag(unsigned flag);
-void daemon_set_loglevel(int loglevel);
+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
 };