X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=7f2f6e8c4bceee0a06cd0a727caa423ed2d8e698;hb=4c5ba2fe22d95b88d865e74a9487ea176e585dad;hp=5e28918e1182956dc43562061f12f7b2b1ce2cc6;hpb=69a36d8615e8f6b07fc24ff4937e5f4a1c60e012;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index 5e28918e..7f2f6e8c 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -22,38 +22,41 @@ **/ #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; -#ifdef HAVE_LIBRRD +#if HAVE_LIBRRD int operating_mode; #endif -void sigIntHandler (int signal) +static void sigIntHandler (int signal) { loop++; } -int change_basedir (char *dir) +static void sigTermHandler (int signal) +{ + loop++; +} + +static int change_basedir (char *dir) { int dirlen = strlen (dir); @@ -69,12 +72,12 @@ int change_basedir (char *dir) { if (mkdir (dir, 0755) == -1) { - syslog (LOG_ERR, "mkdir: %s", strerror (errno)); + syslog (LOG_ERR, "mkdir (%s): %s", dir, strerror (errno)); return (-1); } else if (chdir (dir) == -1) { - syslog (LOG_ERR, "chdir: %s", strerror (errno)); + syslog (LOG_ERR, "chdir (%s): %s", dir, strerror (errno)); return (-1); } } @@ -86,10 +89,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) { @@ -111,51 +114,46 @@ 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" - " -C Configuration file.\n" - " Default: %s\n" - " -P PID File.\n" - " Default: %s\n" - " -M Module/Plugin directory.\n" - " Default: %s\n" - " -D Data storage directory.\n" - " Default: %s\n" + " -C Configuration file.\n" + " Default: "CONFIGFILE"\n" +#if COLLECT_DAEMON " -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" +#endif + "\nBuiltin defaults:\n" + " Config-File "CONFIGFILE"\n" + " PID-File "PIDFILE"\n" + " Data-Directory "PKGLOCALSTATEDIR"\n" +#if COLLECT_DEBUG + " Log-File "LOGFILE"\n" +#endif + "\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n" "by Florian octo Forster \n" - "for contributions see `AUTHORS'\n", - PACKAGE, CONFIGFILE, PIDFILE, PLUGINDIR, PKGLOCALSTATEDIR, 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; -#ifdef HAVE_LIBKSTAT +#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 ())); @@ -174,7 +172,7 @@ int start_client (void) while (loop == 0) { curtime = time (NULL); -#ifdef HAVE_LIBKSTAT +#if HAVE_LIBKSTAT update_kstat (); #endif plugin_read_all (); @@ -189,11 +187,12 @@ int start_client (void) } return (0); -} +} /* static int start_client (void) */ -#ifdef HAVE_LIBRRD -int start_server (void) +#if HAVE_LIBRRD +static int start_server (void) { + /* FIXME use stack here! */ char *host; char *type; char *instance; @@ -201,7 +200,7 @@ int start_server (void) while (loop == 0) { - if (multicast_receive (&host, &type, &instance, &values) == 0) + if (network_receive (&host, &type, &instance, &values) == 0) plugin_write (host, type, instance, values); if (host != NULL) free (host); host = NULL; @@ -211,16 +210,20 @@ int start_server (void) } 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); } @@ -228,31 +231,39 @@ int pidfile_create (void) 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 = PIDFILE; pid_t pid; + int daemonize = 1; +#endif +#if COLLECT_DEBUG + char *logfile = LOGFILE; #endif - char *configfile = CONFIGFILE - char *pidfile = PIDFILE; - char *plugindir = PLUGINDIR; - char *datadir = PKGLOCALSTATEDIR; - - int daemonize = 1; - -#ifdef HAVE_LIBRRD +#if HAVE_LIBRRD operating_mode = MODE_LOCAL; #endif - + /* open syslog */ openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON); @@ -261,13 +272,10 @@ int main (int argc, char **argv) { int c; - c = getopt (argc, argv, "C:P:M:D:fh" -#if HAVE_LIBRRD - "csl" -#endif /* HAVE_LIBRRD */ -#if COLLECT_PING - "p:" -#endif /* COLLECT_PING */ + c = getopt (argc, argv, "hC:" +#if COLLECT_DAEMON + "f" +#endif ); if (c == -1) @@ -275,78 +283,66 @@ int main (int argc, char **argv) switch (c) { -#ifdef 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; - case 'P': - pidfile = optarg; - break; - case 'M': - plugindir = optarg; - break; - case 'D': - datadir = optarg; - break; +#if COLLECT_DAEMON 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 */ +#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 /* - * 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); } + /* + * 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); - sigChldAction.sa_handler = SIG_IGN; sigaction (SIGCHLD, &sigChldAction, NULL); - /* - * fork off child - */ -#if COLLECT_DAEMON + if ((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) @@ -366,7 +362,7 @@ int main (int argc, char **argv) setsid (); /* Write pidfile */ - if (pidfile_create ()) + if (pidfile_create (pidfile)) exit (2); /* close standard descriptors */ @@ -393,21 +389,37 @@ int main (int argc, char **argv) #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) */ #endif start_client (); +#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) */