X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=e13064771dcef9878bef79a3bf5bd289e4ded6ac;hb=803759e1ecb2b332ca9410785dd0d4b5771b7703;hp=a9b1ac80d847834bfff7836f2ca721ffb80ac5e7;hpb=c9b431c4a30a1318360ee4b68258a97070d12038;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index a9b1ac80..e1306477 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -1,11 +1,10 @@ /** * 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,31 +24,21 @@ #include "common.h" #include "utils_debug.h" -#include "multicast.h" +#include "network.h" #include "plugin.h" #include "configfile.h" -#include "ping.h" - static int loop = 0; #if HAVE_LIBKSTAT kstat_ctl_t *kc; #endif /* HAVE_LIBKSTAT */ -#if COLLECT_PING -char *pinghosts[MAX_PINGHOSTS]; -int num_pinghosts = 0; -#endif - /* * exported variables */ time_t curtime; - -#if HAVE_LIBRRD -int operating_mode; -#endif +int operating_mode; static void sigIntHandler (int signal) { @@ -122,6 +111,9 @@ static void update_kstat (void) } /* static void update_kstat (void) */ #endif /* HAVE_LIBKSTAT */ +/* TODO + * Remove all settings but `-f' and `-C' + */ static void exit_usage (char *name) { printf ("Usage: "PACKAGE" [OPTIONS]\n\n" @@ -130,32 +122,21 @@ static void exit_usage (char *name) " General:\n" " -C Configuration file.\n" " Default: "CONFIGFILE"\n" -#if COLLECT_DAEMON - " -P PID file.\n" + " -P PID-file.\n" " Default: "PIDFILE"\n" -#endif - " -M Module/Plugin directory.\n" - " Default: "PLUGINDIR"\n" - " -D Data storage directory.\n" - " Default: "PKGLOCALSTATEDIR"\n" -#if COLLECT_DEBUG - " -L Log file.\n" - " Default: "LOGFILE"\n" -#endif #if COLLECT_DAEMON " -f Don't fork to the background.\n" #endif -#if HAVE_LIBRRD - " -l Start in local mode (no network).\n" - " -c Start in client (sender) mode.\n" - " -s Start in server (listener) mode.\n" -#endif /* HAVE_LIBRRD */ -#if COLLECT_PING - " Ping:\n" - " -p Host to ping periodically, may be repeated to ping\n" - " more than one host.\n" -#endif /* COLLECT_PING */ - "\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n" + "\nBuiltin defaults:\n" + " Config-File "CONFIGFILE"\n" + " PID-File "PIDFILE"\n" + " Data-Directory "PKGLOCALSTATEDIR"\n" +#if COLLECT_DEBUG + " Log-File "LOGFILE"\n" +#endif + " Step "COLLECTD_STEP" seconds\n" + " Heartbeat "COLLECTD_HEARTBEAT" seconds\n" + "\n"PACKAGE" "VERSION", http://collectd.org/\n" "by Florian octo Forster \n" "for contributions see `AUTHORS'\n"); exit (0); @@ -163,7 +144,15 @@ static void exit_usage (char *name) static int start_client (void) { - int sleepingtime; + int step; + + struct timeval tv_now; + struct timeval tv_next; + struct timespec ts_wait; + + step = atoi (COLLECTD_STEP); + if (step <= 0) + step = 10; #if HAVE_LIBKSTAT kc = NULL; @@ -188,18 +177,42 @@ static int start_client (void) while (loop == 0) { - curtime = time (NULL); + if (gettimeofday (&tv_next, NULL) < 0) + { + syslog (LOG_ERR, "gettimeofday failed: %s", strerror (errno)); + return (-1); + } + tv_next.tv_sec += step; + #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); - sleepingtime = 10; - while (sleepingtime != 0) + if (gettimeofday (&tv_now, NULL) < 0) { - if (loop != 0) + syslog (LOG_ERR, "gettimeofday failed: %s", strerror (errno)); + return (-1); + } + + if (timeval_sub_timespec (&tv_next, &tv_now, &ts_wait) != 0) + { + syslog (LOG_WARNING, "Not sleeping because `timeval_sub_timespec' returned non-zero!"); + continue; + } + + while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1)) + { + if (errno != EINTR) + { + syslog (LOG_ERR, "nanosleep failed: %s", strerror (errno)); break; - sleepingtime = sleep (sleepingtime); + } } } @@ -209,15 +222,29 @@ static int start_client (void) #if HAVE_LIBRRD static int start_server (void) { + /* FIXME */ +#if 0 char *host; char *type; char *instance; char *values; - while (loop == 0) + int error_counter = 0; + int status; + + while ((loop == 0) && (error_counter < 3)) { - if (multicast_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; @@ -225,6 +252,7 @@ static int start_server (void) if (values != NULL) free (values); values = NULL; } +#endif return (0); } /* static int start_server (void) */ #endif /* HAVE_LIBRRD */ @@ -243,7 +271,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); @@ -264,12 +292,11 @@ int main (int argc, char **argv) { struct sigaction sigIntAction; struct sigaction sigTermAction; - struct sigaction sigChldAction; - char *configfile = CONFIGFILE; - char *plugindir = PLUGINDIR; char *datadir = PKGLOCALSTATEDIR; + char *configfile = CONFIGFILE; #if COLLECT_DAEMON - char *pidfile = PIDFILE; + struct sigaction sigChldAction; + char *pidfile = NULL; pid_t pid; int daemonize = 1; #endif @@ -279,6 +306,8 @@ int main (int argc, char **argv) #if HAVE_LIBRRD operating_mode = MODE_LOCAL; +#else + operating_mode = MODE_CLIENT; #endif /* open syslog */ @@ -289,19 +318,10 @@ int main (int argc, char **argv) { int c; - c = getopt (argc, argv, "C:M:D:h" + c = getopt (argc, argv, "hC:" #if COLLECT_DAEMON "fP:" #endif -#if COLLECT_DEBUG - "L:" -#endif -#if HAVE_LIBRRD - "csl" -#endif /* HAVE_LIBRRD */ -#if COLLECT_PING - "p:" -#endif /* COLLECT_PING */ ); if (c == -1) @@ -309,19 +329,6 @@ int main (int argc, char **argv) switch (c) { -#if HAVE_LIBRRD - case 'c': - operating_mode = MODE_CLIENT; - break; - - case 's': - operating_mode = MODE_SERVER; - break; - - case 'l': - operating_mode = MODE_LOCAL; - break; -#endif /* HAVE_LIBRRD */ case 'C': configfile = optarg; break; @@ -333,38 +340,23 @@ int main (int argc, char **argv) daemonize = 0; break; #endif /* COLLECT_DAEMON */ - case 'M': - plugindir = optarg; - break; - case 'D': - datadir = optarg; - break; -#if COLLECT_DEBUG - case 'L': - logfile = optarg; - break; -#endif -#if COLLECT_PING - case 'p': - if (num_pinghosts < MAX_PINGHOSTS) - pinghosts[num_pinghosts++] = optarg; - else - fprintf (stderr, "Maximum of %i ping hosts reached.\n", MAX_PINGHOSTS); - break; -#endif /* COLLECT_PING */ case 'h': default: exit_usage (argv[0]); } /* switch (c) */ } /* while (1) */ - DBG_STARTFILE(logfile, "debug file opened."); +#if COLLECT_DEBUG + if ((logfile = cf_get_option ("LogFile", LOGFILE)) != NULL) + DBG_STARTFILE (logfile, "Debug file opened."); +#endif /* - * Read the config file. This will load any modules automagically. + * Read options from the config file, the environment and the command + * line (in that order, with later options overwriting previous ones in + * general). + * Also, this will automatically load modules. */ - plugin_set_dir (plugindir); - if (cf_read (configfile)) { fprintf (stderr, "Error: Reading the config file failed!\n" @@ -376,28 +368,31 @@ int main (int argc, char **argv) * Change directory. We do this _after_ reading the config and loading * modules to relative paths work as expected. */ + if ((datadir = cf_get_option ("DataDir", PKGLOCALSTATEDIR)) == NULL) + { + fprintf (stderr, "Don't have a datadir to use. This should not happen. Ever."); + return (1); + } if (change_basedir (datadir)) { fprintf (stderr, "Error: Unable to change to directory `%s'.\n", datadir); return (1); } +#if COLLECT_DAEMON /* - * install signal handlers + * fork off child */ - sigIntAction.sa_handler = sigIntHandler; - sigaction (SIGINT, &sigIntAction, NULL); - - sigIntAction.sa_handler = sigTermHandler; - sigaction (SIGTERM, &sigTermAction, NULL); - sigChldAction.sa_handler = SIG_IGN; sigaction (SIGCHLD, &sigChldAction, NULL); - /* - * fork off child - */ -#if COLLECT_DAEMON + if ((pidfile == NULL) + && ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL)) + { + fprintf (stderr, "Cannot obtain pidfile. This shoud not happen. Ever."); + return (1); + } + if (daemonize) { if ((pid = fork ()) == -1) @@ -443,17 +438,31 @@ int main (int argc, char **argv) } /* if (daemonize) */ #endif /* COLLECT_DAEMON */ + /* + * install signal handlers + */ + sigIntAction.sa_handler = sigIntHandler; + sigaction (SIGINT, &sigIntAction, NULL); + + sigTermAction.sa_handler = sigTermHandler; + sigaction (SIGTERM, &sigTermAction, NULL); + /* * run the actual loops */ #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 (); - DBG_STOPFILE("debug file closed."); + plugin_shutdown_all (); + +#if COLLECT_DEBUG + if (logfile != NULL) + DBG_STOPFILE("debug file closed."); +#endif /* close syslog */ syslog (LOG_INFO, "Exiting normally"); @@ -461,7 +470,7 @@ int main (int argc, char **argv) #if COLLECT_DAEMON if (daemonize) - pidfile_remove(pidfile); + pidfile_remove (pidfile); #endif /* COLLECT_DAEMON */ return (0);