![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/collectd.c b/src/collectd.c
index dabc346e8e8c5e79bfc7b388ad67675a5b0fec31..0d9a7db872cf8b714383bff404eeb44e64f43f90 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
+/**
+ * collectd - src/collectd.c
+ * Copyright (C) 2005 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
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Authors:
+ * Florian octo Forster <octo at verplant.org>
+ * 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"
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)
+static void exit_usage (char *name)
{
- printf ("Usage: %s [OPTIONS]\n\n"
+ printf ("Usage: "PACKAGE" [OPTIONS]\n\n"
"Available options:\n"
" General:\n"
- " -d <dir> Base directory to use.\n"
- " Default: %s\n"
- " -P <dir> Set the plugin-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"
+ " -C <file> Configuration file.\n"
+ " Default: "CONFIGFILE"\n"
+#if COLLECT_DAEMON
+ " -P <file> PID file.\n"
+ " Default: "PIDFILE"\n"
+#endif
+ " -M <dir> Module/Plugin directory.\n"
+ " Default: "PLUGINDIR"\n"
+ " -D <dir> Data storage directory.\n"
+ " Default: "PKGLOCALSTATEDIR"\n"
+#if COLLECT_DEBUG
+ " -L <file> Log file.\n"
+ " Default: "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 */
- "\n%s %s, http://verplant.org/collectd/\n"
+ "\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n"
"by Florian octo Forster <octo@verplant.org>\n"
- "for contributions see `AUTHORS'\n",
- PACKAGE, DATADIR, PLUGINDIR, PACKAGE, VERSION);
+ "for contributions see `AUTHORS'\n");
exit (0);
-}
+} /* static void exit_usage (char *name) */
-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 (void)
+#if COLLECT_DAEMON
+static int pidfile_create (const char *file)
{
FILE *fh;
- if ((fh = fopen (PIDFILE, "w")) == NULL)
+ if (file == NULL)
+ file = PIDFILE;
+
+ if ((fh = fopen (file, "w")) == NULL)
{
- syslog (LOG_ERR, "fopen (pidfile): %s", strerror (errno));
+ syslog (LOG_ERR, "fopen (%s): %s", file, strerror (errno));
return (1);
}
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
+ struct sigaction sigChldAction;
+#endif
+ struct sigaction sigIntAction;
+ struct sigaction sigTermAction;
+ char *configfile = CONFIGFILE;
+ char *plugindir = NULL;
+ char *datadir = PKGLOCALSTATEDIR;
+#if COLLECT_DAEMON
+ char *pidfile = PIDFILE;
pid_t pid;
+ int daemonize = 1;
+#endif
+#if COLLECT_DEBUG
+ char *logfile = LOGFILE;
+#endif
- char *plugindir = NULL;
- char *basedir = DATADIR;
-
- int daemonize = 1;
-
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
operating_mode = MODE_LOCAL;
#endif
-
- /*
- * open syslog
- */
+
+ /* open syslog */
openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON);
- /*
- * read options
- */
+ /* read options */
while (1)
{
int c;
- c = getopt (argc, argv, "d:fP:h"
+ c = getopt (argc, argv, "C:M:D:h"
+#if COLLECT_DAEMON
+ "fP:"
+#endif
+#if COLLECT_DEBUG
+ "L:"
+#endif
#if HAVE_LIBRRD
"csl"
#endif /* HAVE_LIBRRD */
switch (c)
{
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
case 'c':
operating_mode = MODE_CLIENT;
break;
operating_mode = MODE_LOCAL;
break;
#endif /* HAVE_LIBRRD */
- case 'd':
- basedir = optarg;
+ case 'C':
+ configfile = 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)
fprintf (stderr, "Maximum of %i ping hosts reached.\n", MAX_PINGHOSTS);
break;
#endif /* COLLECT_PING */
- case 'P':
- plugindir = optarg;
- break;
-
case 'h':
default:
exit_usage (argv[0]);
- }
-
- }
+ } /* switch (c) */
+ } /* while (1) */
+
+ 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);
}
- if (change_basedir (basedir))
+ /*
+ * 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", basedir);
+ fprintf (stderr, "Error: Unable to change to directory `%s'.\n", datadir);
return (1);
}
/*
- * 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 DEBUG == 0
if (daemonize)
{
if ((pid = fork ()) == -1)
setsid ();
/* Write pidfile */
- if (pidfile_create ())
+ if (pidfile_create (pidfile))
exit (2);
/* close standard descriptors */
return (1);
}
} /* if (daemonize) */
-#endif
+#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
*/
-#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 ();
- /*
- * close syslog
- */
+ 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) */