#include "collectd.h"
#include "common.h"
-#include "utils_debug.h"
-#include "network.h"
#include "plugin.h"
#include "configfile.h"
+#include "types_list.h"
/*
* Global variables
return (-1);
}
}
- DBG ("hostname_g = %s;", hostname_g);
+ DEBUG ("hostname_g = %s;", hostname_g);
str = global_option_get ("Interval");
if (str == NULL)
- str = COLLECTD_STEP;
+ str = "10";
interval_g = atoi (str);
if (interval_g <= 0)
{
"Please check your settings.\n");
return (-1);
}
- DBG ("interval_g = %i;", interval_g);
+ DEBUG ("interval_g = %i;", interval_g);
return (0);
} /* int init_global_variables */
if (dir == NULL)
{
- syslog (LOG_ERR, "strdup failed: %s", strerror (errno));
+ char errbuf[1024];
+ ERROR ("strdup failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
{
if (mkdir (orig_dir, 0755) == -1)
{
- syslog (LOG_ERR, "mkdir (%s): %s", orig_dir,
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("mkdir (%s): %s", orig_dir,
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
else if (chdir (orig_dir) == -1)
{
- syslog (LOG_ERR, "chdir (%s): %s", orig_dir,
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("chdir (%s): %s", orig_dir,
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
}
else
{
- syslog (LOG_ERR, "chdir (%s): %s", orig_dir,
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("chdir (%s): %s", orig_dir,
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
}
if (kc == NULL)
{
if ((kc = kstat_open ()) == NULL)
- syslog (LOG_ERR, "Unable to open kstat control structure");
+ ERROR ("Unable to open kstat control structure");
}
else
{
kid = kstat_chain_update (kc);
if (kid > 0)
{
- syslog (LOG_INFO, "kstat chain has been updated");
+ INFO ("kstat chain has been updated");
plugin_init_all ();
}
else if (kid < 0)
- syslog (LOG_ERR, "kstat chain update failed");
+ ERROR ("kstat chain update failed");
/* else: everything works as expected */
}
" Config-File "CONFIGFILE"\n"
" PID-File "PIDFILE"\n"
" Data-Directory "PKGLOCALSTATEDIR"\n"
-#if COLLECT_DEBUG
- " Log-File "LOGFILE"\n"
-#endif
- " Step "COLLECTD_STEP" seconds\n"
- " Heartbeat "COLLECTD_HEARTBEAT" seconds\n"
"\n"PACKAGE" "VERSION", http://collectd.org/\n"
"by Florian octo Forster <octo@verplant.org>\n"
"for contributions see `AUTHORS'\n");
#if HAVE_LIBSTATGRAB
if (sg_init ())
{
- syslog (LOG_ERR, "sg_init: %s", sg_str_error (sg_get_error ()));
+ ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
return (-1);
}
if (sg_drop_privileges ())
{
- syslog (LOG_ERR, "sg_drop_privileges: %s", sg_str_error (sg_get_error ()));
+ ERROR ("sg_drop_privileges: %s", sg_str_error (sg_get_error ()));
return (-1);
}
#endif
+ read_types_list ();
plugin_init_all ();
return (0);
{
if (gettimeofday (&tv_next, NULL) < 0)
{
- syslog (LOG_ERR, "gettimeofday failed: %s", strerror (errno));
+ char errbuf[1024];
+ ERROR ("gettimeofday failed: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
tv_next.tv_sec += interval_g;
if (gettimeofday (&tv_now, NULL) < 0)
{
- syslog (LOG_ERR, "gettimeofday failed: %s",
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("gettimeofday failed: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
if (timeval_sub_timespec (&tv_next, &tv_now, &ts_wait) != 0)
{
- syslog (LOG_WARNING, "Not sleeping because "
+ WARNING ("Not sleeping because "
"`timeval_sub_timespec' returned "
"non-zero!");
continue;
{
if (errno != EINTR)
{
- syslog (LOG_ERR, "nanosleep failed: %s", strerror (errno));
+ char errbuf[1024];
+ ERROR ("nanosleep failed: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
}
} /* while (loop == 0) */
- DBG ("return (0);");
+ DEBUG ("return (0);");
return (0);
} /* int do_loop */
if ((fh = fopen (file, "w")) == NULL)
{
- syslog (LOG_ERR, "fopen (%s): %s", file, strerror (errno));
+ char errbuf[1024];
+ ERROR ("fopen (%s): %s", file,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (1);
}
{
const char *file = global_option_get ("PIDFile");
- DBG ("unlink (%s)", (file != NULL) ? file : "<null>");
+ DEBUG ("unlink (%s)", (file != NULL) ? file : "<null>");
return (unlink (file));
} /* static int pidfile_remove (const char *file) */
#endif /* COLLECT_DAEMON */
struct sigaction sigIntAction;
struct sigaction sigTermAction;
char *configfile = CONFIGFILE;
+ int test_config = 0;
const char *basedir;
#if COLLECT_DAEMON
struct sigaction sigChldAction;
pid_t pid;
int daemonize = 1;
#endif
-#if COLLECT_DEBUG
- const char *logfile;
-#endif
-
- /* open syslog */
- openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON);
/* read options */
while (1)
{
int c;
- c = getopt (argc, argv, "hC:"
+ c = getopt (argc, argv, "htC:"
#if COLLECT_DAEMON
"fP:"
#endif
case 'C':
configfile = optarg;
break;
+ case 't':
+ test_config = 1;
+ break;
#if COLLECT_DAEMON
case 'P':
global_option_set ("PIDFile", optarg);
} /* switch (c) */
} /* while (1) */
-#if COLLECT_DEBUG
- if ((logfile = global_option_get ("LogFile")) != NULL)
- DBG_STARTFILE (logfile, "Debug file opened.");
-#endif
-
/*
* Read options from the config file, the environment and the command
* line (in that order, with later options overwriting previous ones in
if (init_global_variables () != 0)
return (1);
+ if (test_config)
+ return (0);
+
#if COLLECT_DAEMON
/*
* fork off child
if ((pid = fork ()) == -1)
{
/* error */
- fprintf (stderr, "fork: %s", strerror (errno));
+ char errbuf[1024];
+ fprintf (stderr, "fork: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (1);
}
else if (pid != 0)
if (open ("/dev/null", O_RDWR) != 0)
{
- syslog (LOG_ERR, "Error: Could not connect `STDIN' to `/dev/null'");
+ ERROR ("Error: Could not connect `STDIN' to `/dev/null'");
return (1);
}
if (dup (0) != 1)
{
- syslog (LOG_ERR, "Error: Could not connect `STDOUT' to `/dev/null'");
+ ERROR ("Error: Could not connect `STDOUT' to `/dev/null'");
return (1);
}
if (dup (0) != 2)
{
- syslog (LOG_ERR, "Error: Could not connect `STDERR' to `/dev/null'");
+ ERROR ("Error: Could not connect `STDERR' to `/dev/null'");
return (1);
}
} /* if (daemonize) */
*/
do_init ();
do_loop ();
- do_shutdown ();
-
-#if COLLECT_DEBUG
- if (logfile != NULL)
- DBG_STOPFILE("debug file closed.");
-#endif
/* close syslog */
- syslog (LOG_INFO, "Exiting normally");
- closelog ();
+ INFO ("Exiting normally");
+
+ do_shutdown ();
#if COLLECT_DAEMON
if (daemonize)