diff --git a/src/collectd.c b/src/collectd.c
index 418a5d7433ecd789115227342907fed1eec3029d..71c1167775b92172765fc3454eb70656a95a1194 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
**/
#include "collectd.h"
+#include "common.h"
+#include "utils_debug.h"
#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
-void sigIntHandler (int signal)
+static void sigIntHandler (int signal)
+{
+ loop++;
+}
+
+static void sigTermHandler (int signal)
{
loop++;
}
-int change_basedir (char *dir)
+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
-void update_kstat (void)
+#if HAVE_LIBKSTAT
+static void update_kstat (void)
{
if (kc == NULL)
{
}
return;
-}
+} /* static void update_kstat (void) */
#endif /* HAVE_LIBKSTAT */
-void exit_usage (char *name)
-{
- printf ("Usage: %s [OPTIONS]\n\n"
-
- "Available options:\n"
- " General:\n"
- /*
- " -C <dir> Configuration file.\n"
- " Default: %s\n"
- */
- " -P <file> PID File.\n"
- " Default: %s\n"
- " -M <dir> Module/Plugin directory.\n"
- " Default: %s\n"
- " -D <dir> Data storage directory.\n"
- " Default: %s\n"
- " -f Don't fork to the background.\n"
-#ifdef 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 */
- "\n%s %s, http://verplant.org/collectd/\n"
- "by Florian octo Forster <octo@verplant.org>\n"
- "for contributions see `AUTHORS'\n",
- PACKAGE, CONFIGFILE, PIDFILE, PLUGINDIR, PKGLOCALSTATEDIR, PACKAGE, VERSION);
- exit (0);
-}
-
-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
-int start_server (void)
+#if HAVE_LIBRRD
+static int start_server (void)
{
char *host;
char *type;
}
return (0);
-}
+} /* static int start_server (void) */
#endif /* HAVE_LIBRRD */
-int pidfile_create (char *file)
+#if COLLECT_DAEMON
+static int pidfile_create (const char *file)
{
FILE *fh;
fclose(fh);
return (0);
-}
+} /* static int pidfile_create (const char *file) */
+#endif /* COLLECT_DAEMON */
-int pidfile_remove (void)
+#if COLLECT_DAEMON
+static int pidfile_remove (const char *file)
{
- return (unlink (PIDFILE));
-}
+ if (file == NULL) {
+ file = PIDFILE;
+ }
+ return (unlink (file));
+} /* static int pidfile_remove (const char *file) */
+#endif /* COLLECT_DAEMON */
int main (int argc, char **argv)
{
- struct sigaction sigIntAction, sigChldAction;
#if COLLECT_DAEMON
- pid_t pid;
+ struct sigaction sigChldAction;
#endif
-
- char *configfile = CONFIGFILE;
+ struct sigaction sigIntAction;
+ struct sigaction sigTermAction;
+ char *datadir;
+#if COLLECT_DAEMON
char *pidfile = PIDFILE;
- char *plugindir = PLUGINDIR;
- char *datadir = PKGLOCALSTATEDIR;
-
- int daemonize = 1;
+ pid_t pid;
+ int daemonize = 1;
+#endif
+#if COLLECT_DEBUG
+ char *logfile = LOGFILE;
+#endif
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
operating_mode = MODE_LOCAL;
#endif
-
+
/* open syslog */
openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON);
- /* read options */
- while (1)
- {
- int c;
-
- c = getopt (argc, argv, "C:P:M:D:fh"
-#if HAVE_LIBRRD
- "csl"
-#endif /* HAVE_LIBRRD */
-#if COLLECT_PING
- "p:"
-#endif /* COLLECT_PING */
- );
+ DBG_STARTFILE(logfile, "Debug file opened.");
- if (c == -1)
- break;
-
- switch (c)
- {
-#ifdef 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;
- break;
- case 'P':
- pidfile = optarg;
- break;
- case 'M':
- plugindir = optarg;
- break;
- case 'D':
- datadir = optarg;
- break;
- case 'f':
- daemonize = 0;
- break;
-#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]);
- }
-
+ /*
+ * 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 (cf_read (argc, argv, CONFIGFILE))
+ {
+ fprintf (stderr, "Error: Reading the config file failed!\n"
+ "Read the syslog for details.\n");
+ return (1);
}
/*
- * Load plugins and change to output directory
- * Loading plugins is done first so relative paths work as expected..
+ * Change directory. We do this _after_ reading the config and loading
+ * modules to relative paths work as expected.
*/
- if (plugin_load_all (plugindir) < 1)
+ if ((datadir = cf_get_mode_option ("DataDir")) == NULL)
{
- fprintf (stderr, "Error: No plugins found.\n");
+ 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_mode_option ("PIDFile")) == NULL)
+ {
+ fprintf (stderr, "Cannot obtain pidfile. This shoud not happen. Ever.");
+ return (1);
+ }
+
if (daemonize)
{
if ((pid = fork ()) == -1)
} /* if (daemonize) */
#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
*/
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
if (operating_mode == MODE_SERVER)
start_server ();
else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */
#endif
start_client ();
+ DBG_STOPFILE("debug file closed.");
+
/* close syslog */
syslog (LOG_INFO, "Exiting normally");
closelog ();
+#if COLLECT_DAEMON
if (daemonize)
- pidfile_remove();
+ pidfile_remove (pidfile);
+#endif /* COLLECT_DAEMON */
return (0);
-}
+} /* int main (int argc, char **argv) */