* Alvaro Barcellos <alvaro.barcellos at gmail.com>
**/
+#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;
kstat_ctl_t *kc;
#endif /* HAVE_LIBKSTAT */
-#if COLLECT_PING
-char *pinghosts[MAX_PINGHOSTS];
-int num_pinghosts = 0;
-#endif
-
/*
* exported variables
*/
int operating_mode;
#endif
-static void
-sigIntHandler (int signal)
+static void sigIntHandler (int signal)
{
loop++;
}
-static int
-change_basedir (char *dir)
+static void sigTermHandler (int signal)
+{
+ loop++;
+}
+
+static int change_basedir (char *dir)
{
int dirlen = strlen (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);
}
}
} /* static int change_basedir (char *dir) */
#if HAVE_LIBKSTAT
-static void
-update_kstat (void)
+static void update_kstat (void)
{
if (kc == NULL)
{
} /* 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"
" General:\n"
" -C <file> Configuration file.\n"
" Default: "CONFIGFILE"\n"
- /* sure you want a configFILE?
- what about a configDIR? - niki */
- /*
- " -C <dir> Configuration directory.\n"
- " Default: "CONFIGDIR"\n"
- */
#if COLLECT_DAEMON
- " -P <file> PID file.\n"
- " Default: "PIDFILE"\n"
+ " -f Don't fork to the background.\n"
#endif
- " -M <dir> Module/Plugin directory.\n"
- " Default: "PLUGINDIR"\n"
- " -D <dir> 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 <file> Log file.\n"
- " Default: "LOGFILE"\n"
+ " Log-File "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> Host to ping periodically, may be repeated to ping\n"
- " more than one host.\n"
-#endif /* COLLECT_PING */
+ " Step "COLLECTD_STEP" seconds\n"
+ " Heartbeat "COLLECTD_HEARTBEAT" seconds\n"
"\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n"
"by Florian octo Forster <octo@verplant.org>\n"
"for contributions see `AUTHORS'\n");
exit (0);
} /* static void exit_usage (char *name) */
-static int
-start_client (void)
+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
+ /* `curtime' is used by many (all?) plugins as the
+ * data-sample-time passed to RRDTool */
+ curtime = time (NULL);
+
+ /* Issue all plugins */
plugin_read_all ();
- sleepingtime = 10;
- while (sleepingtime != 0)
+ 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, "No sleeping because `timeval_sub_timespec' returned non-zero!");
+ continue;
+ }
+
+ while (nanosleep (&ts_wait, &ts_wait) == -1)
+ {
+ if (errno != EINTR)
+ {
+ syslog (LOG_ERR, "nanosleep failed: %s", strerror (errno));
break;
- sleepingtime = sleep (sleepingtime);
+ }
}
}
} /* static int start_client (void) */
#if HAVE_LIBRRD
-static int
-start_server (void)
+static int start_server (void)
{
+ /* FIXME use stack here! */
char *host;
char *type;
char *instance;
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;
#endif /* HAVE_LIBRRD */
#if COLLECT_DAEMON
-static int
-pidfile_create (const char *file)
+static int pidfile_create (const char *file)
{
FILE *fh;
#endif /* COLLECT_DAEMON */
#if COLLECT_DAEMON
-static int
-pidfile_remove (const char *file)
+static int pidfile_remove (const char *file)
{
if (file == NULL) {
file = PIDFILE;
} /* 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;
- char *configfile = CONFIGFILE;
-/* or char *configdir = CONFIGDIR; */
- char *plugindir = PLUGINDIR;
+ 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;
+ int daemonize = 1;
#endif
#if COLLECT_DEBUG
char *logfile = LOGFILE;
{
int c;
- c = getopt (argc, argv, "C:M:D:h"
+ c = getopt (argc, argv, "hC:"
#if COLLECT_DAEMON
- "fP:"
-#endif
-#if COLLECT_DEBUG
- "L:"
+ "f"
#endif
-#if HAVE_LIBRRD
- "csl"
-#endif /* HAVE_LIBRRD */
-#if COLLECT_PING
- "p:"
-#endif /* COLLECT_PING */
);
if (c == -1)
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;
- 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 = 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)
#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
*/
#if HAVE_LIBRRD
#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");
#if COLLECT_DAEMON
if (daemonize)
- pidfile_remove(pidfile);
+ pidfile_remove (pidfile);
#endif /* COLLECT_DAEMON */
return (0);
projects / collectd.git / blobdiff