Merge branch 'collectd-4.2'

diff --combined src/logfile.c
index 00dc030,2b546ac..911d14d
--- 1/src/logfile.c
--- 2/src/logfile.c
+++ b/src/logfile.c
@@@ -1,6 -1,7 +1,7 @@@
  /**
   * collectd - src/logfile.c
   * Copyright (C) 2007  Sebastian Harl
+  * Copyright (C) 2007  Florian Forster
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the
@@@ -26,8 -27,6 +27,8 @@@
  
  #include <pthread.h>
  
 +#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
 +
  #if COLLECT_DEBUG
  static int log_level = LOG_DEBUG;
  #else
@@@ -86,15 -85,20 +87,15 @@@ static int logfile_config (const char *
        return 0;
  } /* int logfile_config (const char *, const char *) */
  
 -static void logfile_log (int severity, const char *msg)
 +static void logfile_print (const char *msg, time_t timestamp_time)
  {
        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",
@@@ -104,12 -108,7 +105,12 @@@
  
        pthread_mutex_lock (&file_lock);
  
 -      if ((log_file == NULL) || (strcasecmp (log_file, "stderr") == 0))
 +      if (log_file == NULL)
 +      {
 +              fh = fopen (DEFAULT_LOGFILE, "a");
 +              do_close = 1;
 +      }
 +      else if (strcasecmp (log_file, "stderr") == 0)
                fh = stderr;
        else if (strcasecmp (log_file, "stdout") == 0)
                fh = stdout;
@@@ -123,7 -122,7 +124,7 @@@
        {
                        char errbuf[1024];
                        fprintf (stderr, "logfile plugin: fopen (%s) failed: %s\n",
 -                                      (log_file == NULL) ? "<null>" : log_file,
 +                                      (log_file == NULL) ? DEFAULT_LOGFILE : log_file,
                                        sstrerror (errno, errbuf, sizeof (errbuf)));
        }
        else
@@@ -140,40 -139,13 +141,40 @@@
        pthread_mutex_unlock (&file_lock);
  
        return;
 +} /* void logfile_print */
 +
 +static void logfile_log (int severity, const char *msg)
 +{
 +      if (severity > log_level)
 +              return;
 +
 +      logfile_print (msg, time (NULL));
  } /* void logfile_log (int, const char *) */
  
 +int logfile_notification (const notification_t *n)
 +{
 +      char msg[1024] = "";
 +      int status;
 +
 +      status = snprintf (msg, sizeof (msg), "Notification: %s: message = %s, "
 +                      "host = %s",
 +                      (n->severity == NOTIF_FAILURE) ? "FAILURE"
 +                      : ((n->severity == NOTIF_WARNING) ? "WARNING"
 +                              : ((n->severity == NOTIF_OKAY) ? "OKAY" : "UNKNOWN")),
 +                      n->message, n->host);
 +      msg[sizeof (msg) - 1] = '\0';
 +
 +      logfile_print (msg, n->time);
 +
 +      return (0);
 +} /* int logfile_notification */
 +
  void module_register (void)
  {
        plugin_register_config ("logfile", logfile_config,
                        config_keys, config_keys_num);
        plugin_register_log ("logfile", logfile_log);
 +      plugin_register_notification ("logfile", logfile_notification);
  } /* void module_register (void) */
  
  /* vim: set sw=4 ts=4 tw=78 noexpandtab : */

diff --combined src/network.c
index 4ed7eb1,1934431..c347552
--- 1/src/network.c
--- 2/src/network.c
+++ b/src/network.c
@@@ -682,16 -682,6 +682,16 @@@ static int network_set_ttl (const socke
  static int network_bind_socket (const sockent_t *se, const struct addrinfo *ai)
  {
        int loop = 0;
 +      int yes  = 1;
 +
 +      /* allow multiple sockets to use the same PORT number */
 +      if (setsockopt(se->fd, SOL_SOCKET, SO_REUSEADDR,
 +                              &yes, sizeof(yes)) == -1) {
 +                char errbuf[1024];
 +                ERROR ("setsockopt: %s", 
 +                                sstrerror (errno, errbuf, sizeof (errbuf)));
 +              return (-1);
 +      }
  
        DEBUG ("fd = %i; calling `bind'", se->fd);
  
@@@ -999,7 -989,7 +999,7 @@@ static int network_add_sending_socket (
        return (0);
  } /* int network_get_listen_socket */
  
- int network_receive (void)
+ static int network_receive (void)
  {
        char buffer[BUFF_SIZE];
        int  buffer_len;