Implement colored logging for para_server.

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 96a40f3388b02aff06d478268dca7ef9ff667c42..1fadf7279306b6fab8d195199b15d83ac5646607 100644 (file)
--- a/server.c
+++ b/server.c
@@ -64,6 +64,7 @@
 
 #include <signal.h>
 #include <dirent.h>
+#include <sys/time.h>
 
 #include "para.h"
 #include "error.h"
@@ -84,6 +85,7 @@
 #include "sched.h"
 #include "signal.h"
 #include "user_list.h"
+#include "color.h"
 
 /** Define the array of error lists needed by para_server. */
 INIT_SERVER_ERRLISTS;
@@ -130,6 +132,77 @@ struct server_command_task {
        struct task task;
 };
 
+static int want_colors(void)
+{
+       if (conf.color_arg == color_arg_no)
+               return 0;
+       if (conf.color_arg == color_arg_yes)
+               return 1;
+       if (logfile)
+               return 0;
+       return isatty(STDERR_FILENO);
+}
+
+static int get_loglevel_by_name(const char *txt, size_t n)
+{
+       if (!strncasecmp(txt, "debug", n))
+               return LL_DEBUG;
+       if (!strncasecmp(txt, "info", n))
+               return LL_INFO;
+       if (!strncasecmp(txt, "notice", n))
+               return LL_NOTICE;
+       if (!strncasecmp(txt, "warning", n))
+               return LL_WARNING;
+       if (!strncasecmp(txt, "error", n))
+               return LL_ERROR;
+       if (!strncasecmp(txt, "crit", n))
+               return LL_CRIT;
+       if (!strncasecmp(txt, "emerg", n))
+               return LL_EMERG;
+       return -1;
+}
+
+static char log_colors[NUM_LOGLEVELS][COLOR_MAXLEN];
+
+static void init_colors_or_die(void)
+{
+       int ret, i;
+       static const char *default_log_colors[NUM_LOGLEVELS] = {
+                       [LL_DEBUG] = "normal",
+                       [LL_INFO] = "white bold",
+                       [LL_NOTICE] = "cyan bold",
+                       [LL_WARNING] = "green bold",
+                       [LL_ERROR] = "yellow bold",
+                       [LL_CRIT] = "magenta bold",
+                       [LL_EMERG] = "red bold",
+       };
+
+       for (i = 0; i < NUM_LOGLEVELS; i++) {
+               ret = color_parse(default_log_colors[i], log_colors[i]);
+               assert(ret >= 0);
+       }
+
+       for (i = 0; i < conf.log_color_given; i++) {
+               char *arg = conf.log_color_arg[i], *p = strchr(arg, ':');
+               int ll;
+               if (!p)
+                       goto err;
+               ret = get_loglevel_by_name(arg, p - arg);
+               if (ret < 0)
+                       goto err;
+               ll = ret;
+               p++;
+               ret = color_parse(p, log_colors[ll]);
+               if (ret < 0)
+                       goto err;
+       }
+       return;
+err:
+       PARA_EMERG_LOG("color syntax error, arg %d (%s)\n", i,
+               conf.log_color_arg[i]);
+       exit(EXIT_FAILURE);
+}
+
 /**
  * Para_server's log function.
  *
@@ -139,33 +212,44 @@ struct server_command_task {
 __printf_2_3 void para_log(int ll, const char* fmt,...)
 {
        va_list argp;
-       FILE *outfd;
+       FILE *fp;
        struct tm *tm;
        time_t t1;
-       char str[MAXLINE] = "";
-       pid_t mypid;
+       char *color, str[MAXLINE] = "";
 
+       ll = PARA_MIN(ll, NUM_LOGLEVELS - 1);
+       ll = PARA_MAX(ll, LL_DEBUG);
        if (ll < conf.loglevel_arg)
                return;
-       outfd = logfile? logfile : stderr;
+
+       fp = logfile? logfile : stderr;
+       color = want_colors()? log_colors[ll] : NULL;
+
+       if (color)
+               fprintf(fp, "%s", color);
+       /* date and time */
        time(&t1);
        tm = localtime(&t1);
        strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
-       fprintf(outfd, "%s ", str);
-       if (conf.loglevel_arg <= INFO)
-               fprintf(outfd, "%i: ", ll);
-       mypid = getpid();
-       if (conf.loglevel_arg <= INFO)
-               fprintf(outfd, "(%d) ", (int)mypid);
+       fprintf(fp, "%s ", str);
+       /* loglevel */
+       if (conf.loglevel_arg <= LL_INFO)
+               fprintf(fp, "%i: ", ll);
+       if (conf.loglevel_arg <= LL_INFO) { /* log pid */
+               pid_t mypid = getpid();
+               fprintf(fp, "(%d) ", (int)mypid);
+       }
        va_start(argp, fmt);
-       vfprintf(outfd, fmt, argp);
+       vfprintf(fp, fmt, argp);
        va_end(argp);
+       if (color)
+               fprintf(fp, "%s", COLOR_RESET);
 }
 
 /*
  * setup shared memory area and get mutex for locking
  */
-static void shm_init(void)
+static void init_ipc_or_die(void)
 {
        void *shm;
        int ret = shm_new(sizeof(struct misc_meta_data));
@@ -197,13 +281,23 @@ err_out:
        exit(EXIT_FAILURE);
 }
 
-static void parse_config(int override)
+/**
+ * (Re-)read the server configuration files.
+ *
+ * \param override Passed to gengetopt to activate the override feature.
+ *
+ * This function also re-opens the logfile and sets the global \a
+ * user_list_file variable.
+ */
+void parse_config_or_die(int override)
 {
        char *home = para_homedir();
        struct stat statbuf;
        int ret;
        char *cf;
 
+       close_log(logfile);
+       logfile = NULL;
        if (conf.config_file_given)
                cf = para_strdup(conf.config_file_arg);
        else
@@ -233,6 +327,8 @@ static void parse_config(int override)
        }
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);
+       if (want_colors())
+               init_colors_or_die();
        ret = 1;
 out:
        free(cf);
@@ -256,9 +352,7 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void handle_sighup(void)
 {
        PARA_NOTICE_LOG("SIGHUP\n");
-       close_log(logfile); /* gets reopened if necessary by parse_config */
-       logfile = NULL;
-       parse_config(1); /* reopens log */
+       parse_config_or_die(1); /* reopens log */
        init_user_list(user_list_file); /* reload user list */
        if (mmd->afs_pid)
                kill(mmd->afs_pid, SIGHUP);
@@ -481,11 +575,13 @@ static void server_init(int argc, char **argv)
        /* parse command line options */
        server_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("server", conf);
-       para_drop_privileges(conf.user_arg, conf.group_arg);
+       drop_privileges_or_die(conf.user_arg, conf.group_arg);
        /* parse config file, open log and set defaults */
-       parse_config(0);
+       parse_config_or_die(0);
        log_welcome("para_server", conf.loglevel_arg);
-       shm_init(); /* init mmd struct */
+       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 */
        init_user_list(user_list_file);
        /* become daemon */