X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=94c4a8cba6b9aae8646491f3eeddfff016914c7b;hp=541e44defedc3d17d609dc13b09cf18a94c493e0;hb=074b80bb23b8fa610464bd98dc4bc7dd2babc88a;hpb=3150a0caa27a34d44556fb77f4a5aebc3d978580 diff --git a/daemon.c b/daemon.c index 541e44de..94c4a8cb 100644 --- a/daemon.c +++ b/daemon.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2011 Andre Noll + * Copyright (C) 1997 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -10,8 +10,7 @@ #include #include /* getgrnam() */ #include -#include -#include +#include #include "para.h" #include "daemon.h" @@ -38,12 +37,7 @@ struct daemon { static struct daemon the_daemon, *me = &the_daemon; -/** - * Activate default log colors. - * - * This should be called early if color support is wanted. - */ -void daemon_set_default_log_colors(void) +static void daemon_set_default_log_colors(void) { int i; static const char *default_log_colors[NUM_LOGLEVELS] = { @@ -59,16 +53,12 @@ void daemon_set_default_log_colors(void) color_parse_or_die(default_log_colors[i], me->log_colors[i]); } -/** +/* * Set the color for one loglevel. * - * \param arg The loglevel/color specifier. - * - * \a arg must be of the form "ll:[fg [bg]] [attr]". - * - * \return 1 On success, -1 on errors. + * arg must be of the form "ll:[fg [bg]] [attr]". */ -void daemon_set_log_color_or_die(char const *arg) +static void daemon_set_log_color_or_die(char const *arg) { char *p = strchr(arg, ':'); int ret, ll; @@ -87,6 +77,45 @@ err: exit(EXIT_FAILURE); } +/** + * Initialize color mode if necessary. + * + * \param color_arg The argument given to --color. + * \param color_arg_auto The value for automatic color detection. + * \param color_arg_no The value to disable colored log messages. + * \param logfile_given In auto mode colors are disabled if this value is true. + * \param log_color_argv Color specifiers given to --log-color. + * \param argc Number of color specifiers in \a log_color_argv. + * + * If \a color_arg equals \a color_arg_no, color mode is disabled, i.e., calls + * to \a para_log() will not produce colored output. If \a color_arg == \a + * color_arg_auto, the function autodetects whether to activate colors. + * Otherwise color mode is enabled. + * + * If color mode is to be enabled, the strings in \a log_color_argv are parsed + * and the color scheme is updated accordingly. For each loglevel, the default + * colors apply if there is no log_color_argv for this loglevel. + */ +void daemon_init_colors_or_die(int color_arg, int color_arg_auto, + int color_arg_no, bool logfile_given, char **log_color_argv, + int argc) +{ + int i; + + if (color_arg == color_arg_no) + return; + if (color_arg == color_arg_auto) { + if (logfile_given) + return; + if (!isatty(STDERR_FILENO)) + return; + } + daemon_set_flag(DF_COLOR_LOG); + daemon_set_default_log_colors(); + for (i = 0; i < argc; i++) + daemon_set_log_color_or_die(log_color_argv[i]); +} + /** * Init or change the name of the log file. * @@ -125,18 +154,6 @@ void daemon_set_flag(unsigned flag) me->flags |= flag; } -/** - * Clear one of the daemon config flags. - * - * \param flag The flag to clear. - * - * \sa \ref daemon_flags. - */ -void daemon_clear_flag(unsigned flag) -{ - me->flags &= ~flag; -} - static bool daemon_test_flag(unsigned flag) { return me->flags & flag; @@ -182,7 +199,7 @@ void daemonize(bool parent_waits) goto err; if (chdir("/") < 0) goto err; - null = open("/dev/null", O_RDONLY); + null = open("/dev/null", O_RDWR); if (null < 0) goto err; if (dup2(null, STDIN_FILENO) < 0) @@ -226,16 +243,21 @@ void daemon_open_log_or_die(void) strerror(errno)); exit(EXIT_FAILURE); } - setlinebuf(me->logfile); + /* equivalent to setlinebuf(), but portable */ + setvbuf(me->logfile, NULL, _IOLBF, 0); } /** * Log the startup message containing the paraslash version. + * + * \param name The name of the executable. + * + * First the given \a name is prefixed with the string "para_". Next the git + * version is appended. The resulting string is logged with priority "INFO". */ -void log_welcome(const char *whoami) +void daemon_log_welcome(const char *name) { - PARA_INFO_LOG("welcome to %s " PACKAGE_VERSION " ("BUILD_DATE")\n", - whoami); + PARA_INFO_LOG("welcome to para_%s-" PACKAGE_VERSION " \n", name); } /** @@ -252,7 +274,7 @@ void log_welcome(const char *whoami) * * \sa getpwnam(3), getuid(2), setuid(2), getgrnam(2), setgid(2) */ -void drop_privileges_or_die(const char *username, const char *groupname) +void daemon_drop_privileges_or_die(const char *username, const char *groupname) { struct passwd *p; char *tmp; @@ -293,27 +315,20 @@ void drop_privileges_or_die(const char *username, const char *groupname) } /** - * Set the server startup time. - * - * \param startuptime The value to store as the server start time. + * Set the startup time. * - * This should be called once on startup with \a startuptime either NULL or a - * pointer to a struct timeval which contains the current time. If \a - * startuptime is NULL, the server start time is set to the current time. + * This should be called once on startup. It sets the start time to the + * current time. The stored time is used for retrieving the server uptime. * - * \sa time(2), difftime(3) \ref get_server_uptime(), \ref - * get_server_uptime_str(). + * \sa time(2), \ref daemon_get_uptime(), \ref daemon_get_uptime_str(). */ -void set_server_start_time(const struct timeval *startuptime) +void daemon_set_start_time(void) { - if (startuptime) - me->startuptime = startuptime->tv_sec; - else - time(&me->startuptime); + time(&me->startuptime); } /** - * Get the server uptime. + * Get the uptime. * * \param current_time The current time. * @@ -322,9 +337,9 @@ void set_server_start_time(const struct timeval *startuptime) * * \return This returns the server uptime in seconds, i.e. the difference * between the current time and the value stored previously via \ref - * set_server_start_time(). + * daemon_set_start_time(). */ -time_t get_server_uptime(const struct timeval *current_time) +time_t daemon_get_uptime(const struct timeval *current_time) { time_t t; @@ -337,15 +352,15 @@ time_t get_server_uptime(const struct timeval *current_time) /** * Construct a string containing the current uptime. * - * \param current_time See a \ref get_server_uptime(). + * \param current_time See a \ref daemon_get_uptime(). * * \return A dynamically allocated string of the form "days:hours:minutes". * * \sa server_uptime. */ -__malloc char *get_server_uptime_str(const struct timeval *current_time) +__malloc char *daemon_get_uptime_str(const struct timeval *current_time) { - long t = get_server_uptime(current_time); + long t = daemon_get_uptime(current_time); return make_message("%li:%02li:%02li", t / 86400, (t / 3600) % 24, (t / 60) % 60); } @@ -356,7 +371,7 @@ __malloc char *get_server_uptime_str(const struct timeval *current_time) * \param ll The log level. * \param fmt The format string describing the log message. */ -__printf_2_3 void para_log(int ll, const char* fmt,...) +__printf_2_3 void daemon_log(int ll, const char* fmt,...) { va_list argp; FILE *fp; @@ -376,7 +391,7 @@ __printf_2_3 void para_log(int ll, const char* fmt,...) fprintf(fp, "%s", color); if (log_time || log_timing) { struct timeval tv; - gettimeofday(&tv, NULL); + clock_get_realtime(&tv); if (daemon_test_flag(DF_LOG_TIME)) { /* print date and time */ time_t t1 = tv.tv_sec; char str[100];