Merge branch 'collectd-4.1' into collectd-4.2

[collectd.git] / src / logfile.c

diff --git a/src/logfile.c b/src/logfile.c
index fed0a75..03c2f92 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -1,5 +1,5 @@
 /**
- * collectd - src/stderr.c
+ * collectd - src/logfile.c
  * Copyright (C) 2007  Sebastian Harl
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -35,15 +35,17 @@ static int log_level = LOG_INFO;
 static pthread_mutex_t file_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static char *log_file = NULL;
+static int print_timestamp = 1;
 
 static const char *config_keys[] =
 {
        "LogLevel",
-       "File"
+       "File",
+       "Timestamp"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
-static int stderr_config (const char *key, const char *value)
+static int logfile_config (const char *key, const char *value)
 {
        if (0 == strcasecmp (key, "LogLevel")) {
                if ((0 == strcasecmp (value, "emerg"))
@@ -66,31 +68,43 @@ static int stderr_config (const char *key, const char *value)
        }
        else if (0 == strcasecmp (key, "File")) {
                sfree (log_file);
-
-               if (access (value, W_OK) == 0)
-                       log_file = strdup (value);
-               else {
-                       char errbuf[1024];
-                       /* We can't use `ERROR' yet.. */
-                       fprintf (stderr, "stderr plugin: Access to %s denied: %s\n",
-                                       value, sstrerror (errno, errbuf, sizeof (errbuf)));
-                       return 1;
-               }
+               log_file = strdup (value);
+       }
+       else if (0 == strcasecmp (key, "File")) {
+               if ((strcasecmp (value, "false") == 0)
+                               || (strcasecmp (value, "no") == 0)
+                               || (strcasecmp (value, "off") == 0))
+                       print_timestamp = 0;
+               else
+                       print_timestamp = 1;
        }
        else {
                return -1;
        }
        return 0;
-} /* int stderr_config (const char *, const char *) */
+} /* int logfile_config (const char *, const char *) */
 
-static void stderr_log (int severity, const char *msg)
+static void logfile_log (int severity, const char *msg)
 {
        FILE *fh;
        int do_close = 0;
+       time_t timestamp_time;
+       struct tm timestamp_tm;
+       char timestamp_str[64];
 
        if (severity > log_level)
                return;
 
+       if (print_timestamp)
+       {
+               timestamp_time = time (NULL);
+               localtime_r (&timestamp_time, &timestamp_tm);
+
+               strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
+                               &timestamp_tm);
+               timestamp_str[sizeof (timestamp_str) - 1] = '\0';
+       }
+
        pthread_mutex_lock (&file_lock);
 
        if ((log_file == NULL) || (strcasecmp (log_file, "stderr") == 0))
@@ -106,13 +120,17 @@ static void stderr_log (int severity, const char *msg)
        if (fh == NULL)
        {
                        char errbuf[1024];
-                       fprintf (stderr, "stderr plugin: fopen (%s) failed: %s\n",
+                       fprintf (stderr, "logfile plugin: fopen (%s) failed: %s\n",
                                        (log_file == NULL) ? "<null>" : log_file,
                                        sstrerror (errno, errbuf, sizeof (errbuf)));
        }
        else
        {
-               fprintf (fh, "%s\n", msg);
+               if (print_timestamp)
+                       fprintf (fh, "[%s] %s\n", timestamp_str, msg);
+               else
+                       fprintf (fh, "%s\n", msg);
+
                if (do_close != 0)
                        fclose (fh);
        }
@@ -120,14 +138,13 @@ static void stderr_log (int severity, const char *msg)
        pthread_mutex_unlock (&file_lock);
 
        return;
-} /* void stderr_log (int, const char *) */
+} /* void logfile_log (int, const char *) */
 
 void module_register (void)
 {
-       plugin_register_config ("stderr", stderr_config,
+       plugin_register_config ("logfile", logfile_config,
                        config_keys, config_keys_num);
-       plugin_register_log ("stderr", stderr_log);
-       return;
+       plugin_register_log ("logfile", logfile_log);
 } /* void module_register (void) */
 
 /* vim: set sw=4 ts=4 tw=78 noexpandtab : */