X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=e13064771dcef9878bef79a3bf5bd289e4ded6ac;hb=2cea8075c666a6c6c7d6e1b4f95e1bee6f3803ac;hp=ca7edb5408478bf8641b7110032d76f6fe30fee0;hpb=dd7eb19ac13a5eb4e39894a0d613067a70f194a0;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index ca7edb54..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 @@ -22,39 +21,36 @@ **/ #include "collectd.h" +#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; -#ifdef HAVE_LIBKSTAT +#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; +int operating_mode; -#ifdef HAVE_LIBRRD -int operating_mode; -#endif +static void sigIntHandler (int signal) +{ + loop++; +} -void sigIntHandler (int signal) +static void sigTermHandler (int signal) { loop++; } -int change_basedir (char *dir) +static int change_basedir (char *dir) { int dirlen = strlen (dir); @@ -87,10 +83,10 @@ int change_basedir (char *dir) } return (0); -} +} /* static int change_basedir (char *dir) */ -#ifdef HAVE_LIBKSTAT -void update_kstat (void) +#if HAVE_LIBKSTAT +static void update_kstat (void) { if (kc == NULL) { @@ -112,47 +108,58 @@ void update_kstat (void) } return; -} +} /* static void update_kstat (void) */ #endif /* HAVE_LIBKSTAT */ -void exit_usage (char *name) +/* TODO + * Remove all settings but `-f' and `-C' + */ +static void exit_usage (char *name) { - printf ("Usage: %s [OPTIONS]\n\n" + printf ("Usage: "PACKAGE" [OPTIONS]\n\n" "Available options:\n" " General:\n" - " -d Base directory to use.\n" - " Default: %s\n" - " -P Set the plugin-directory\n" - " Default: %s\n" - " -f Don't fork to the background\n" -#ifdef 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%s %s, http://verplant.org/collectd/\n" + " -C Configuration file.\n" + " Default: "CONFIGFILE"\n" + " -P PID-file.\n" + " Default: "PIDFILE"\n" +#if COLLECT_DAEMON + " -f Don't fork to the background.\n" +#endif + "\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", - PACKAGE, DATADIR, PLUGINDIR, PACKAGE, VERSION); + "for contributions see `AUTHORS'\n"); exit (0); -} +} /* static void exit_usage (char *name) */ -int start_client (void) +static int start_client (void) { - int sleepingtime; + int step; -#ifdef HAVE_LIBKSTAT + 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; update_kstat (); #endif -#ifdef HAVE_LIBSTATGRAB +#if HAVE_LIBSTATGRAB if (sg_init ()) { syslog (LOG_ERR, "sg_init: %s", sg_str_error (sg_get_error ())); @@ -170,36 +177,74 @@ int start_client (void) while (loop == 0) { - curtime = time (NULL); -#ifdef HAVE_LIBKSTAT + 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); + + if (gettimeofday (&tv_now, NULL) < 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; + } - sleepingtime = 10; - while (sleepingtime != 0) + while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1)) { - if (loop != 0) + if (errno != EINTR) + { + syslog (LOG_ERR, "nanosleep failed: %s", strerror (errno)); break; - sleepingtime = sleep (sleepingtime); + } } } return (0); -} +} /* static int start_client (void) */ -#ifdef HAVE_LIBRRD -int start_server (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; @@ -207,67 +252,76 @@ int start_server (void) if (values != NULL) free (values); values = NULL; } +#endif return (0); -} +} /* static int start_server (void) */ #endif /* HAVE_LIBRRD */ -int pidfile_create (void) +#if COLLECT_DAEMON +static int pidfile_create (const char *file) { FILE *fh; - if ((fh = fopen (PIDFILE, "w")) == NULL) + if (file == NULL) + file = PIDFILE; + + if ((fh = fopen (file, "w")) == NULL) { - syslog (LOG_ERR, "fopen (pidfile): %s", strerror (errno)); + syslog (LOG_ERR, "fopen (%s): %s", file, strerror (errno)); return (1); } - fprintf (fh, "%d\n", getpid()); + fprintf (fh, "%i\n", (int) getpid ()); fclose(fh); return (0); -} +} /* static int pidfile_create (const char *file) */ +#endif /* COLLECT_DAEMON */ -int pidfile_remove (void) +#if COLLECT_DAEMON +static int pidfile_remove (const char *file) { - return (unlink (PIDFILE)); -} + if (file == NULL) { + file = PIDFILE; + } + return (unlink (file)); +} /* static int pidfile_remove (const char *file) */ +#endif /* COLLECT_DAEMON */ int main (int argc, char **argv) { - struct sigaction sigIntAction, sigChldAction; + struct sigaction sigIntAction; + struct sigaction sigTermAction; + char *datadir = PKGLOCALSTATEDIR; + char *configfile = CONFIGFILE; #if COLLECT_DAEMON + struct sigaction sigChldAction; + char *pidfile = NULL; pid_t pid; + int daemonize = 1; +#endif +#if COLLECT_DEBUG + char *logfile = LOGFILE; #endif - char *plugindir = NULL; - char *basedir = DATADIR; - char *configfile = NULL; - - int daemonize = 1; - -#ifdef HAVE_LIBRRD +#if HAVE_LIBRRD operating_mode = MODE_LOCAL; +#else + operating_mode = MODE_CLIENT; #endif - - /* - * open syslog - */ + + /* open syslog */ openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON); - /* - * read options - */ + /* read options */ while (1) { int c; - c = getopt (argc, argv, "d:fP:h" -#if HAVE_LIBRRD - "csl" -#endif /* HAVE_LIBRRD */ -#if COLLECT_PING - "p:" -#endif /* COLLECT_PING */ + c = getopt (argc, argv, "hC:" +#if COLLECT_DAEMON + "fP:" +#endif ); if (c == -1) @@ -275,49 +329,34 @@ int main (int argc, char **argv) switch (c) { -#ifdef HAVE_LIBRRD - case 'c': - operating_mode = MODE_CLIENT; + case 'C': + configfile = optarg; break; - - case 's': - operating_mode = MODE_SERVER; - break; - - case 'l': - operating_mode = MODE_LOCAL; - break; -#endif /* HAVE_LIBRRD */ - case 'd': - basedir = optarg; +#if COLLECT_DAEMON + case 'P': + pidfile = optarg; break; case 'f': daemonize = 0; break; -#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 'P': - plugindir = optarg; - break; - +#endif /* COLLECT_DAEMON */ case 'h': default: exit_usage (argv[0]); - } - - } + } /* switch (c) */ + } /* while (1) */ + +#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" @@ -329,25 +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 (change_basedir (basedir)) + if ((datadir = cf_get_option ("DataDir", PKGLOCALSTATEDIR)) == NULL) { - fprintf (stderr, "Error: Unable to change to directory `%s'.\n", basedir); + 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); - 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) @@ -367,7 +412,7 @@ int main (int argc, char **argv) setsid (); /* Write pidfile */ - if (pidfile_create ()) + if (pidfile_create (pidfile)) exit (2); /* close standard descriptors */ @@ -393,24 +438,40 @@ 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 */ -#ifdef HAVE_LIBRRD +#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 (); - /* - * close syslog - */ + plugin_shutdown_all (); + +#if COLLECT_DEBUG + if (logfile != NULL) + DBG_STOPFILE("debug file closed."); +#endif + + /* close syslog */ syslog (LOG_INFO, "Exiting normally"); closelog (); +#if COLLECT_DAEMON if (daemonize) - pidfile_remove(); + pidfile_remove (pidfile); +#endif /* COLLECT_DAEMON */ return (0); -} +} /* int main (int argc, char **argv) */