iptables plugin: Adds a plugin to collect iptables'-counters.

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 6513cd4..a93cc28 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/collectd.c
- * Copyright (C) 2005  Florian octo Forster
+ * Copyright (C) 2005,2006  Florian octo 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
@@ -29,8 +29,6 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#include "ping.h"
-
 static int loop = 0;
 
 #if HAVE_LIBKSTAT
@@ -41,10 +39,7 @@ kstat_ctl_t *kc;
  * exported variables
  */
 time_t curtime;
-
-#if HAVE_LIBRRD
-int operating_mode;
-#endif
+int    operating_mode;
 
 static void sigIntHandler (int signal)
 {
@@ -128,6 +123,8 @@ static void exit_usage (char *name)
                        "  General:\n"
                        "    -C <file>       Configuration file.\n"
                        "                    Default: "CONFIGFILE"\n"
+                       "    -P <file>       PID-file.\n"
+                       "                    Default: "PIDFILE"\n"
 #if COLLECT_DAEMON
                        "    -f              Don't fork to the background.\n"
 #endif
@@ -140,7 +137,7 @@ static void exit_usage (char *name)
 #endif
                        "  Step              "COLLECTD_STEP" seconds\n"
                        "  Heartbeat         "COLLECTD_HEARTBEAT" seconds\n"
-                       "\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n"
+                       "\n"PACKAGE" "VERSION", http://collectd.org/\n"
                        "by Florian octo Forster <octo@verplant.org>\n"
                        "for contributions see `AUTHORS'\n");
        exit (0);
@@ -191,7 +188,12 @@ static int start_client (void)
 #if HAVE_LIBKSTAT
                update_kstat ();
 #endif
-               plugin_read_all ();
+               /* `curtime' is used by many (all?) plugins as the
+                * data-sample-time passed to RRDTool */
+               curtime = time (NULL);
+
+               /* Issue all plugins */
+               plugin_read_all (&loop);
 
                if (gettimeofday (&tv_now, NULL) < 0)
                {
@@ -201,11 +203,11 @@ static int start_client (void)
 
                if (timeval_sub_timespec (&tv_next, &tv_now, &ts_wait) != 0)
                {
-                       syslog (LOG_WARNING, "No sleeping because `timeval_sub_timespec' returned non-zero!");
+                       syslog (LOG_WARNING, "Not sleeping because `timeval_sub_timespec' returned non-zero!");
                        continue;
                }
 
-               while (nanosleep (&ts_wait, &ts_wait) == -1)
+               while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1))
                {
                        if (errno != EINTR)
                        {
@@ -221,16 +223,27 @@ static int start_client (void)
 #if HAVE_LIBRRD
 static int start_server (void)
 {
-       /* FIXME use stack here! */
        char *host;
        char *type;
        char *instance;
        char *values;
 
-       while (loop == 0)
+       int  error_counter = 0;
+       int  status;
+
+       while ((loop == 0) && (error_counter < 3))
        {
-               if (network_receive (&host, &type, &instance, &values) == 0)
-                       plugin_write (host, type, instance, values);
+               status = network_receive (&host, &type, &instance, &values);
+
+               if (status != 0)
+               {
+                       if (status < 0)
+                               error_counter++;
+                       continue;
+               }
+               error_counter = 0;
+
+               plugin_write (host, type, instance, values);
 
                if (host     != NULL) free (host);     host     = NULL;
                if (type     != NULL) free (type);     type     = NULL;
@@ -256,7 +269,7 @@ static int pidfile_create (const char *file)
                return (1);
        }
 
-       fprintf (fh, "%d\n", getpid());
+       fprintf (fh, "%i\n", (int) getpid ());
        fclose(fh);
 
        return (0);
@@ -281,7 +294,7 @@ int main (int argc, char **argv)
        char *configfile = CONFIGFILE;
 #if COLLECT_DAEMON
        struct sigaction sigChldAction;
-       char *pidfile    = PIDFILE;
+       char *pidfile    = NULL;
        pid_t pid;
        int daemonize    = 1;
 #endif
@@ -291,6 +304,8 @@ int main (int argc, char **argv)
 
 #if HAVE_LIBRRD
        operating_mode = MODE_LOCAL;
+#else
+       operating_mode = MODE_CLIENT;
 #endif
 
        /* open syslog */
@@ -303,7 +318,7 @@ int main (int argc, char **argv)
 
                c = getopt (argc, argv, "hC:"
 #if COLLECT_DAEMON
-                               "f"
+                               "fP:"
 #endif
                );
 
@@ -316,6 +331,9 @@ int main (int argc, char **argv)
                                configfile = optarg;
                                break;
 #if COLLECT_DAEMON
+                       case 'P':
+                               pidfile = optarg;
+                               break;
                        case 'f':
                                daemonize = 0;
                                break;
@@ -366,7 +384,8 @@ int main (int argc, char **argv)
        sigChldAction.sa_handler = SIG_IGN;
        sigaction (SIGCHLD, &sigChldAction, NULL);
 
-       if ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL)
+       if ((pidfile == NULL)
+                       && ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL))
        {
                fprintf (stderr, "Cannot obtain pidfile. This shoud not happen. Ever.");
                return (1);
@@ -432,10 +451,12 @@ int main (int argc, char **argv)
 #if HAVE_LIBRRD
        if (operating_mode == MODE_SERVER)
                start_server ();
-       else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */
+       else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL || operating_mode == MODE_LOG) */
 #endif
                start_client ();
 
+       plugin_shutdown_all ();
+
 #if COLLECT_DEBUG
        if (logfile != NULL)
                DBG_STOPFILE("debug file closed.");