X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=ab5564ead694502e0dd510804a406a1bf4e7376c;hb=f8c6d793143453b064c68f92cb17e88302b8bbb9;hp=ebfc62c2c2ea2035236572b4f2db433d67927466;hpb=aae4c145facc272c6cd4de37d140ece4fb412bd1;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index ebfc62c2..ab5564ea 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-2007 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 @@ -21,13 +20,13 @@ * Alvaro Barcellos **/ +#include "collectd.h" #include "common.h" #include "utils_debug.h" -#include "multicast.h" +#include "network.h" #include "plugin.h" - -#include "ping.h" +#include "configfile.h" static int loop = 0; @@ -35,55 +34,64 @@ static int loop = 0; 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 +static void sigIntHandler (int signal) +{ + loop++; +} -static void -sigIntHandler (int signal) +static void sigTermHandler (int signal) { loop++; } -static int -change_basedir (char *dir) +static int change_basedir (const char *orig_dir) { - int dirlen = strlen (dir); + char *dir = strdup (orig_dir); + int dirlen; + int status; + + if (dir == NULL) + { + syslog (LOG_ERR, "strdup failed: %s", strerror (errno)); + return (-1); + } + dirlen = strlen (dir); while ((dirlen > 0) && (dir[dirlen - 1] == '/')) dir[--dirlen] = '\0'; if (dirlen <= 0) return (-1); - if (chdir (dir) == -1) + status = chdir (dir); + free (dir); + + if (status != 0) { if (errno == ENOENT) { - if (mkdir (dir, 0755) == -1) + if (mkdir (orig_dir, 0755) == -1) { - syslog (LOG_ERR, "mkdir: %s", strerror (errno)); + syslog (LOG_ERR, "mkdir (%s): %s", orig_dir, + strerror (errno)); return (-1); } - else if (chdir (dir) == -1) + else if (chdir (orig_dir) == -1) { - syslog (LOG_ERR, "chdir: %s", strerror (errno)); + syslog (LOG_ERR, "chdir (%s): %s", orig_dir, + strerror (errno)); return (-1); } } else { - syslog (LOG_ERR, "chdir: %s", strerror (errno)); + syslog (LOG_ERR, "chdir (%s): %s", orig_dir, + strerror (errno)); return (-1); } } @@ -92,8 +100,7 @@ change_basedir (char *dir) } /* static int change_basedir (char *dir) */ #if HAVE_LIBKSTAT -static void -update_kstat (void) +static void update_kstat (void) { if (kc == NULL) { @@ -118,8 +125,10 @@ update_kstat (void) } /* static void update_kstat (void) */ #endif /* HAVE_LIBKSTAT */ -static void -exit_usage (char *name) +/* TODO + * Remove all settings but `-f' and `-C' + */ +static void exit_usage (char *name) { printf ("Usage: "PACKAGE" [OPTIONS]\n\n" @@ -127,48 +136,28 @@ exit_usage (char *name) " General:\n" " -C Configuration file.\n" " Default: "CONFIGFILE"\n" - /* sure you want a configFILE? - what about a configDIR? - niki */ - /* - " -C Configuration directory.\n" - " Default: "CONFIGDIR"\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); } /* static void exit_usage (char *name) */ -static int -start_client (void) +static int do_init (void) { - int sleepingtime; - #if HAVE_LIBKSTAT kc = NULL; update_kstat (); @@ -190,58 +179,81 @@ start_client (void) plugin_init_all (); + return (0); +} /* int do_init () */ + + +static int do_loop (void) +{ + int step; + + struct timeval tv_now; + struct timeval tv_next; + struct timespec ts_wait; + + step = atoi (COLLECTD_STEP); + if (step <= 0) + step = 10; + 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) - break; - sleepingtime = sleep (sleepingtime); + syslog (LOG_ERR, "gettimeofday failed: %s", + strerror (errno)); + return (-1); } - } - return (0); -} /* static int start_client (void) */ + if (timeval_sub_timespec (&tv_next, &tv_now, &ts_wait) != 0) + { + syslog (LOG_WARNING, "Not sleeping because " + "`timeval_sub_timespec' returned " + "non-zero!"); + continue; + } -#if HAVE_LIBRRD -static int -start_server (void) -{ - char *host; - char *type; - char *instance; - char *values; + while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1)) + { + if (errno != EINTR) + { + syslog (LOG_ERR, "nanosleep failed: %s", strerror (errno)); + return (-1); + } + } + } /* while (loop == 0) */ - while (loop == 0) - { - if (multicast_receive (&host, &type, &instance, &values) == 0) - plugin_write (host, type, instance, values); + DBG ("return (0);"); + return (0); +} /* int do_loop */ - if (host != NULL) free (host); host = NULL; - if (type != NULL) free (type); type = NULL; - if (instance != NULL) free (instance); instance = NULL; - if (values != NULL) free (values); values = NULL; - } - +static int do_shutdown (void) +{ + plugin_shutdown_all (); return (0); -} /* static int start_server (void) */ -#endif /* HAVE_LIBRRD */ +} /* int do_shutdown */ #if COLLECT_DAEMON -static int -pidfile_create (const char *file) +static int pidfile_create (void) { FILE *fh; - - if (file == NULL) - file = PIDFILE; + const char *file = global_option_get ("PIDFile"); if ((fh = fopen (file, "w")) == NULL) { @@ -249,43 +261,34 @@ pidfile_create (const char *file) 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 */ -#if COLLECT_DAEMON -static int -pidfile_remove (const char *file) +static int pidfile_remove (void) { - if (file == NULL) { - file = PIDFILE; - } - return (unlink (file)); + const char *file = global_option_get ("PIDFile"); + + DBG ("unlink (%s)", (file != NULL) ? file : ""); + return (unlink (file)); } /* static int pidfile_remove (const char *file) */ #endif /* COLLECT_DAEMON */ -int -main (int argc, char **argv) +int main (int argc, char **argv) { - struct sigaction sigIntAction, sigChldAction; + struct sigaction sigIntAction; + struct sigaction sigTermAction; char *configfile = CONFIGFILE; -/* or char *configdir = CONFIGDIR; */ - char *plugindir = PLUGINDIR; - char *datadir = PKGLOCALSTATEDIR; + const char *datadir; #if COLLECT_DAEMON - char *pidfile = PIDFILE; + struct sigaction sigChldAction; pid_t pid; - int daemonize = 1; + int daemonize = 1; #endif #if COLLECT_DEBUG - char *logfile = LOGFILE; -#endif - -#if HAVE_LIBRRD - operating_mode = MODE_LOCAL; + const char *logfile; #endif /* open syslog */ @@ -296,19 +299,10 @@ 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) @@ -316,87 +310,64 @@ 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; - /* configdir = optarg; */ break; #if COLLECT_DAEMON case 'P': - pidfile = optarg; + global_option_set ("PIDFile", optarg); break; case 'f': 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 = global_option_get ("LogFile")) != NULL) + DBG_STARTFILE (logfile, "Debug file opened."); +#endif /* - * Load plugins and change to output directory - * Loading plugins is done first so relative paths work as expected.. + * 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. */ - if (plugin_load_all (plugindir) < 1) + if (cf_read (configfile)) { - fprintf (stderr, "Error: No plugins found.\n"); + fprintf (stderr, "Error: Reading the config file failed!\n" + "Read the syslog for details.\n"); return (1); } - if (change_basedir (datadir)) + /* + * Change directory. We do this _after_ reading the config and loading + * modules to relative paths work as expected. + */ + if ((datadir = global_option_get ("BaseDir")) == NULL) + { + fprintf (stderr, "Don't have a datadir to use. This should not happen. Ever."); + return (1); + } + else 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); - + memset (&sigChldAction, '\0', sizeof (sigChldAction)); sigChldAction.sa_handler = SIG_IGN; sigaction (SIGCHLD, &sigChldAction, NULL); - /* - * fork off child - */ -#if COLLECT_DAEMON if (daemonize) { if ((pid = fork ()) == -1) @@ -416,7 +387,7 @@ main (int argc, char **argv) setsid (); /* Write pidfile */ - if (pidfile_create (pidfile)) + if (pidfile_create ()) exit (2); /* close standard descriptors */ @@ -442,17 +413,28 @@ main (int argc, char **argv) } /* if (daemonize) */ #endif /* COLLECT_DAEMON */ + /* + * install signal handlers + */ + memset (&sigIntAction, '\0', sizeof (sigIntAction)); + sigIntAction.sa_handler = sigIntHandler; + sigaction (SIGINT, &sigIntAction, NULL); + + memset (&sigTermAction, '\0', sizeof (sigTermAction)); + 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) */ -#endif - start_client (); + do_init (); + do_loop (); + do_shutdown (); - DBG_STOPFILE("debug file closed."); +#if COLLECT_DEBUG + if (logfile != NULL) + DBG_STOPFILE("debug file closed."); +#endif /* close syslog */ syslog (LOG_INFO, "Exiting normally"); @@ -460,8 +442,8 @@ main (int argc, char **argv) #if COLLECT_DAEMON if (daemonize) - pidfile_remove(pidfile); + pidfile_remove (); #endif /* COLLECT_DAEMON */ return (0); -} /* int main (int argc, char **argv) */ +} /* int main */