X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollectd.c;h=49998f96101b9c7d94e48d76aa92c63c7b80eff9;hb=4256c346a988d202b31442f6837d2672af80798b;hp=ab5564ead694502e0dd510804a406a1bf4e7376c;hpb=cb7fed8bf0af2646dfcb32844933398c28e39be5;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index ab5564ea..49998f96 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -22,22 +22,21 @@ #include "collectd.h" #include "common.h" -#include "utils_debug.h" -#include "network.h" #include "plugin.h" #include "configfile.h" +#include "types_list.h" -static int loop = 0; - +/* + * Global variables + */ +char hostname_g[DATA_MAX_NAME_LEN]; +int interval_g; #if HAVE_LIBKSTAT kstat_ctl_t *kc; #endif /* HAVE_LIBKSTAT */ -/* - * exported variables - */ -time_t curtime; +static int loop = 0; static void sigIntHandler (int signal) { @@ -49,6 +48,41 @@ static void sigTermHandler (int signal) loop++; } +static int init_global_variables (void) +{ + const char *str; + + str = global_option_get ("Hostname"); + if (str != NULL) + { + strncpy (hostname_g, str, sizeof (hostname_g)); + } + else + { + if (gethostname (hostname_g, sizeof (hostname_g)) != 0) + { + fprintf (stderr, "`gethostname' failed and no " + "hostname was configured.\n"); + return (-1); + } + } + DEBUG ("hostname_g = %s;", hostname_g); + + str = global_option_get ("Interval"); + if (str == NULL) + str = "10"; + interval_g = atoi (str); + if (interval_g <= 0) + { + fprintf (stderr, "Cannot set the interval to a correct value.\n" + "Please check your settings.\n"); + return (-1); + } + DEBUG ("interval_g = %i;", interval_g); + + return (0); +} /* int init_global_variables */ + static int change_basedir (const char *orig_dir) { char *dir = strdup (orig_dir); @@ -57,7 +91,9 @@ static int change_basedir (const char *orig_dir) 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); } @@ -77,21 +113,27 @@ static int change_basedir (const char *orig_dir) { 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); } } @@ -105,7 +147,7 @@ static void update_kstat (void) 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 { @@ -113,11 +155,11 @@ static void update_kstat (void) 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 */ } @@ -145,11 +187,6 @@ static void exit_usage (char *name) " 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 \n" "for contributions see `AUTHORS'\n"); @@ -166,17 +203,18 @@ static int do_init (void) #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); @@ -185,45 +223,41 @@ static int do_init (void) static int do_loop (void) { - int step; - struct timeval tv_now; struct timeval tv_next; struct timespec ts_wait; - step = atoi (COLLECTD_STEP); - if (step <= 0) - step = 10; - while (loop == 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 += step; + tv_next.tv_sec += interval_g; #if HAVE_LIBKSTAT update_kstat (); #endif - /* `curtime' is used by many (all?) plugins as the - * data-sample-time passed to RRDTool */ - curtime = time (NULL); /* Issue all plugins */ plugin_read_all (&loop); 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; @@ -233,13 +267,16 @@ static int do_loop (void) { 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 */ @@ -257,7 +294,9 @@ static int pidfile_create (void) 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); } @@ -271,7 +310,7 @@ static int pidfile_remove (void) { const char *file = global_option_get ("PIDFile"); - DBG ("unlink (%s)", (file != NULL) ? file : ""); + DEBUG ("unlink (%s)", (file != NULL) ? file : ""); return (unlink (file)); } /* static int pidfile_remove (const char *file) */ #endif /* COLLECT_DAEMON */ @@ -281,18 +320,12 @@ int main (int argc, char **argv) struct sigaction sigIntAction; struct sigaction sigTermAction; char *configfile = CONFIGFILE; - const char *datadir; + 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) @@ -327,11 +360,6 @@ int main (int argc, char **argv) } /* 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 @@ -349,17 +377,26 @@ int main (int argc, char **argv) * Change directory. We do this _after_ reading the config and loading * modules to relative paths work as expected. */ - if ((datadir = global_option_get ("BaseDir")) == NULL) + if ((basedir = global_option_get ("BaseDir")) == NULL) { - fprintf (stderr, "Don't have a datadir to use. This should not happen. Ever."); + fprintf (stderr, "Don't have a basedir to use. This should not happen. Ever."); return (1); } - else if (change_basedir (datadir)) + else if (change_basedir (basedir)) { - fprintf (stderr, "Error: Unable to change to directory `%s'.\n", datadir); + fprintf (stderr, "Error: Unable to change to directory `%s'.\n", basedir); return (1); } + /* + * Set global variables or, if that failes, exit. We cannot run with + * them being uninitialized. If nothing is configured, then defaults + * are being used. So this means that the user has actually done + * something wrong. + */ + if (init_global_variables () != 0) + return (1); + #if COLLECT_DAEMON /* * fork off child @@ -373,7 +410,10 @@ int main (int argc, char **argv) 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) @@ -397,17 +437,17 @@ int main (int argc, char **argv) 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) */ @@ -429,16 +469,11 @@ int main (int argc, char **argv) */ 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)