X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=7f2f6e8c4bceee0a06cd0a727caa423ed2d8e698;hb=390817c0535690516ae146a8d384108dcd87ea99;hp=0d9a7db872cf8b714383bff404eeb44e64f43f90;hpb=500559839355fc4061afe1d010d9f9479bca450d;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index 0d9a7db8..7f2f6e8c 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -25,7 +25,7 @@ #include "common.h" #include "utils_debug.h" -#include "multicast.h" +#include "network.h" #include "plugin.h" #include "configfile.h" @@ -37,11 +37,6 @@ 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 */ @@ -122,6 +117,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" @@ -131,30 +129,15 @@ static void exit_usage (char *name) " -C Configuration file.\n" " Default: "CONFIGFILE"\n" #if COLLECT_DAEMON - " -P PID file.\n" - " Default: "PIDFILE"\n" + " -f Don't fork to the background.\n" #endif - " -M Module/Plugin directory.\n" - " Default: "PLUGINDIR"\n" - " -D Data storage directory.\n" - " Default: "PKGLOCALSTATEDIR"\n" + "\nBuiltin defaults:\n" + " Config-File "CONFIGFILE"\n" + " PID-File "PIDFILE"\n" + " Data-Directory "PKGLOCALSTATEDIR"\n" #if COLLECT_DEBUG - " -L Log file.\n" - " Default: "LOGFILE"\n" -#endif -#if COLLECT_DAEMON - " -f Don't fork to the background.\n" + " Log-File "LOGFILE"\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" "by Florian octo Forster \n" "for contributions see `AUTHORS'\n"); @@ -209,6 +192,7 @@ static int start_client (void) #if HAVE_LIBRRD static int start_server (void) { + /* FIXME use stack here! */ char *host; char *type; char *instance; @@ -216,7 +200,7 @@ static 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; @@ -262,15 +246,12 @@ static int pidfile_remove (const char *file) int main (int argc, char **argv) { -#if COLLECT_DAEMON - struct sigaction sigChldAction; -#endif struct sigaction sigIntAction; struct sigaction sigTermAction; - char *configfile = CONFIGFILE; - char *plugindir = NULL; char *datadir = PKGLOCALSTATEDIR; + char *configfile = CONFIGFILE; #if COLLECT_DAEMON + struct sigaction sigChldAction; char *pidfile = PIDFILE; pid_t pid; int daemonize = 1; @@ -291,19 +272,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:" + "f" #endif -#if COLLECT_DEBUG - "L:" -#endif -#if HAVE_LIBRRD - "csl" -#endif /* HAVE_LIBRRD */ -#if COLLECT_PING - "p:" -#endif /* COLLECT_PING */ ); if (c == -1) @@ -311,68 +283,31 @@ 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; #if COLLECT_DAEMON - case 'P': - 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."); - - /* FIXME this is the wrong place to call this function, because - * `cf_read' is called below. We'll need an extra callback for this. - * Right now though I'm to tired to do this. G'night. -octo */ - if ((plugindir == NULL) && ((plugindir = cf_get_mode_option ("PluginDir")) == NULL)) - plugindir = PLUGINDIR; +#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" @@ -384,19 +319,30 @@ 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 /* * fork off child */ -#if COLLECT_DAEMON sigChldAction.sa_handler = SIG_IGN; sigaction (SIGCHLD, &sigChldAction, NULL); + 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) @@ -448,7 +394,7 @@ int main (int argc, char **argv) sigIntAction.sa_handler = sigIntHandler; sigaction (SIGINT, &sigIntAction, NULL); - sigIntAction.sa_handler = sigTermHandler; + sigTermAction.sa_handler = sigTermHandler; sigaction (SIGTERM, &sigTermAction, NULL); /* @@ -461,7 +407,10 @@ int main (int argc, char **argv) #endif start_client (); - DBG_STOPFILE("debug file closed."); +#if COLLECT_DEBUG + if (logfile != NULL) + DBG_STOPFILE("debug file closed."); +#endif /* close syslog */ syslog (LOG_INFO, "Exiting normally"); @@ -469,7 +418,7 @@ int main (int argc, char **argv) #if COLLECT_DAEMON if (daemonize) - pidfile_remove(pidfile); + pidfile_remove (pidfile); #endif /* COLLECT_DAEMON */ return (0);