diff --git a/src/collectd.c b/src/collectd.c
index 76c62d9c977f12fa145a7e34daf0f31f10720e86..0d9a7db872cf8b714383bff404eeb44e64f43f90 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
* Alvaro Barcellos <alvaro.barcellos at gmail.com>
**/
+#include "collectd.h"
#include "common.h"
#include "utils_debug.h"
#include "multicast.h"
#include "plugin.h"
+#include "configfile.h"
#include "ping.h"
loop++;
}
+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);
}
}
int main (int argc, char **argv)
{
- struct sigaction sigIntAction, sigChldAction;
+#if COLLECT_DAEMON
+ struct sigaction sigChldAction;
+#endif
+ struct sigaction sigIntAction;
+ struct sigaction sigTermAction;
char *configfile = CONFIGFILE;
- char *plugindir = PLUGINDIR;
+ char *plugindir = NULL;
char *datadir = PKGLOCALSTATEDIR;
#if COLLECT_DAEMON
char *pidfile = PIDFILE;
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;
+
/*
- * 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);
}
/*
- * install signal handlers
+ * fork off child
*/
- sigIntAction.sa_handler = sigIntHandler;
- sigaction (SIGINT, &sigIntAction, NULL);
-
+#if COLLECT_DAEMON
sigChldAction.sa_handler = SIG_IGN;
sigaction (SIGCHLD, &sigChldAction, NULL);
- /*
- * fork off child
- */
-#if COLLECT_DAEMON
if (daemonize)
{
if ((pid = fork ()) == -1)
} /* if (daemonize) */
#endif /* COLLECT_DAEMON */
+ /*
+ * install signal handlers
+ */
+ sigIntAction.sa_handler = sigIntHandler;
+ sigaction (SIGINT, &sigIntAction, NULL);
+
+ sigIntAction.sa_handler = sigTermHandler;
+ sigaction (SIGTERM, &sigTermAction, NULL);
+
/*
* run the actual loops
*/