X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=a1e15bf1e7ca52b674632b1308012c91297d2c00;hb=c4d01367a1c5dd7dde3dbaf9dc374f38f8a1020a;hp=71c1167775b92172765fc3454eb70656a95a1194;hpb=0334d1bf754bf285668cdbc4243a972495f25dd7;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index 71c11677..a1e15bf1 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -1,6 +1,6 @@ /** * 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 @@ -25,31 +25,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,9 +112,48 @@ 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" + + "Available options:\n" + " General:\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"); + exit (0); +} /* 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; @@ -149,18 +178,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); - sleepingtime = 10; - while (sleepingtime != 0) + /* 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) { - if (loop != 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); + } } } @@ -170,6 +223,7 @@ static int start_client (void) #if HAVE_LIBRRD static int start_server (void) { + /* FIXME use stack here! */ char *host; char *type; char *instance; @@ -177,7 +231,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; @@ -204,7 +258,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); @@ -223,14 +277,13 @@ 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 *datadir; + 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 @@ -240,12 +293,50 @@ int main (int argc, char **argv) #if HAVE_LIBRRD operating_mode = MODE_LOCAL; +#else + operating_mode = MODE_CLIENT; #endif /* open syslog */ openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON); - DBG_STARTFILE(logfile, "Debug file opened."); + /* read options */ + while (1) + { + int c; + + c = getopt (argc, argv, "hC:" +#if COLLECT_DAEMON + "fP:" +#endif + ); + + if (c == -1) + break; + + switch (c) + { + case 'C': + configfile = optarg; + break; +#if COLLECT_DAEMON + case 'P': + pidfile = optarg; + break; + case 'f': + daemonize = 0; + 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 options from the config file, the environment and the command @@ -253,7 +344,7 @@ int main (int argc, char **argv) * general). * Also, this will automatically load modules. */ - if (cf_read (argc, argv, CONFIGFILE)) + if (cf_read (configfile)) { fprintf (stderr, "Error: Reading the config file failed!\n" "Read the syslog for details.\n"); @@ -264,7 +355,7 @@ 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_mode_option ("DataDir")) == NULL) + if ((datadir = cf_get_option ("DataDir", PKGLOCALSTATEDIR)) == NULL) { fprintf (stderr, "Don't have a datadir to use. This should not happen. Ever."); return (1); @@ -282,7 +373,8 @@ int main (int argc, char **argv) sigChldAction.sa_handler = SIG_IGN; sigaction (SIGCHLD, &sigChldAction, NULL); - if ((pidfile = cf_get_mode_option ("PIDFile")) == NULL) + if ((pidfile == NULL) + && ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL)) { fprintf (stderr, "Cannot obtain pidfile. This shoud not happen. Ever."); return (1); @@ -348,11 +440,16 @@ int main (int argc, char **argv) #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");