![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/collectd.c b/src/collectd.c
index a9b1ac80d847834bfff7836f2ca721ffb80ac5e7..71c1167775b92172765fc3454eb70656a95a1194 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
} /* static void update_kstat (void) */
#endif /* HAVE_LIBKSTAT */
-static void exit_usage (char *name)
-{
- printf ("Usage: "PACKAGE" [OPTIONS]\n\n"
-
- "Available options:\n"
- " General:\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"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)
{
int sleepingtime;
int main (int argc, char **argv)
{
+#if COLLECT_DAEMON
+ struct sigaction sigChldAction;
+#endif
struct sigaction sigIntAction;
struct sigaction sigTermAction;
- struct sigaction sigChldAction;
- char *configfile = CONFIGFILE;
- char *plugindir = PLUGINDIR;
- char *datadir = PKGLOCALSTATEDIR;
+ char *datadir;
#if COLLECT_DAEMON
char *pidfile = PIDFILE;
pid_t pid;
/* open syslog */
openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON);
- /* read options */
- while (1)
- {
- int c;
-
- 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 */
-#if COLLECT_PING
- "p:"
-#endif /* COLLECT_PING */
- );
-
- if (c == -1)
- break;
-
- 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;
- 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.");
+ DBG_STARTFILE(logfile, "Debug file opened.");
/*
- * Read the config file. This will load any modules automagically.
+ * 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.
*/
- plugin_set_dir (plugindir);
-
- if (cf_read (configfile))
+ if (cf_read (argc, argv, CONFIGFILE))
{
fprintf (stderr, "Error: Reading the config file failed!\n"
"Read the syslog for details.\n");
* Change directory. We do this _after_ reading the config and loading
* modules to relative paths work as expected.
*/
+ if ((datadir = cf_get_mode_option ("DataDir")) == 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);
-
- sigIntAction.sa_handler = sigTermHandler;
- sigaction (SIGTERM, &sigTermAction, 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
*/
#if COLLECT_DAEMON
if (daemonize)
- pidfile_remove(pidfile);
+ pidfile_remove (pidfile);
#endif /* COLLECT_DAEMON */
return (0);