diff --git a/src/collectd.c b/src/collectd.c
index c7ea35b6886b58e5189419dcd9b2efc26e927455..e8081785564cacc572cb5161907d48166606aa7b 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
#include "multicast.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 */
*/
time_t curtime;
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
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);
}
}
return (0);
} /* static int change_basedir (char *dir) */
-#ifdef HAVE_LIBKSTAT
-static void
-update_kstat (void)
+#if HAVE_LIBKSTAT
+static void update_kstat (void)
{
if (kc == NULL)
{
} /* static void update_kstat (void) */
#endif /* HAVE_LIBKSTAT */
-static void
-exit_usage (char *name)
+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"
exit (0);
} /* static void exit_usage (char *name) */
-static 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 ()));
while (loop == 0)
{
curtime = time (NULL);
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
update_kstat ();
#endif
plugin_read_all ();
return (0);
} /* static int start_client (void) */
-#ifdef HAVE_LIBRRD
-static int
-start_server (void)
+#if HAVE_LIBRRD
+static int start_server (void)
{
char *host;
char *type;
#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;
}
- return (unlink (file));
+ return (unlink (file));
} /* 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;
+ struct sigaction sigIntAction;
+ struct sigaction sigTermAction;
+ struct sigaction sigChldAction;
char *configfile = CONFIGFILE;
-/* or char *configdir = CONFIGDIR; */
char *plugindir = PLUGINDIR;
char *datadir = PKGLOCALSTATEDIR;
#if COLLECT_DAEMON
char *pidfile = PIDFILE;
pid_t pid;
- int daemonize = 1;
+ int daemonize = 1;
#endif
#if COLLECT_DEBUG
char *logfile = LOGFILE;
#endif
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
operating_mode = MODE_LOCAL;
#endif
switch (c)
{
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
case 'c':
operating_mode = MODE_CLIENT;
break;
#endif /* HAVE_LIBRRD */
case 'C':
configfile = optarg;
- /* configdir = optarg; */
break;
#if COLLECT_DAEMON
case 'P':
DBG_STARTFILE(logfile, "debug file opened.");
/*
- * Load plugins and change to output directory
- * Loading plugins is done first so relative paths work as expected..
+ * Read the config file. This will load any modules automagically.
*/
- if (plugin_load_all (plugindir) < 1)
+ plugin_set_dir (plugindir);
+
+ 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 (change_basedir (datadir))
{
fprintf (stderr, "Error: Unable to change to directory `%s'.\n", datadir);
sigIntAction.sa_handler = sigIntHandler;
sigaction (SIGINT, &sigIntAction, NULL);
+ sigIntAction.sa_handler = sigTermHandler;
+ sigaction (SIGTERM, &sigTermAction, NULL);
+
sigChldAction.sa_handler = SIG_IGN;
sigaction (SIGCHLD, &sigChldAction, 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) */