/**
* 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
#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)
{
" General:\n"
" -C <file> Configuration file.\n"
" Default: "CONFIGFILE"\n"
+ " -P <file> PID-file.\n"
+ " Default: "PIDFILE"\n"
#if COLLECT_DAEMON
" -f Don't fork to the background.\n"
#endif
- "\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 <octo@verplant.org>\n"
"for contributions see `AUTHORS'\n");
exit (0);
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;
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)
+ 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;
+ }
+
+ while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1))
+ {
+ if (errno != EINTR)
+ {
+ syslog (LOG_ERR, "nanosleep failed: %s", strerror (errno));
break;
- sleepingtime = sleep (sleepingtime);
+ }
}
}
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;
return (1);
}
- fprintf (fh, "%d\n", getpid());
+ fprintf (fh, "%i\n", (int) getpid ());
fclose(fh);
return (0);
char *configfile = CONFIGFILE;
#if COLLECT_DAEMON
struct sigaction sigChldAction;
- char *pidfile = PIDFILE;
+ char *pidfile = NULL;
pid_t pid;
int daemonize = 1;
#endif
#if HAVE_LIBRRD
operating_mode = MODE_LOCAL;
+#else
+ operating_mode = MODE_CLIENT;
#endif
/* open syslog */
{
int c;
- /* FIXME */
- c = getopt (argc, argv, "C:"
+ c = getopt (argc, argv, "hC:"
#if COLLECT_DAEMON
- "f"
+ "fP:"
#endif
);
configfile = optarg;
break;
#if COLLECT_DAEMON
+ case 'P':
+ pidfile = optarg;
+ break;
case 'f':
daemonize = 0;
break;
} /* while (1) */
#if COLLECT_DEBUG
- if ((logfile = cf_get_mode_option ("LogFile")) != NULL)
+ if ((logfile = cf_get_option ("LogFile", LOGFILE)) != NULL)
DBG_STARTFILE (logfile, "Debug file opened.");
#endif
* 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);
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);
#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 ();
+ plugin_shutdown_all ();
+
#if COLLECT_DEBUG
if (logfile != NULL)
DBG_STOPFILE("debug file closed.");
projects / collectd.git / blobdiff