X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=1b44e1537153afbef6edc546739c6a174791d961;hb=d68f1b428fd794fae3e909c65396289f14c6f99b;hp=5a17124e1daf1b0cc24fa9a38848727f1df4480c;hpb=c87194194948fec81eb7ead8b7d9615efc7778e1;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index 5a17124e..1b44e153 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -1,6 +1,6 @@ /** * collectd - src/collectd.c - * Copyright (C) 2005 Florian octo Forster + * Copyright (C) 2005,2006 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 @@ -29,8 +29,6 @@ #include "plugin.h" #include "configfile.h" -#include "ping.h" - static int loop = 0; #if HAVE_LIBKSTAT @@ -41,10 +39,7 @@ kstat_ctl_t *kc; * exported variables */ time_t curtime; - -#if HAVE_LIBRRD -int operating_mode; -#endif +int operating_mode; static void sigIntHandler (int signal) { @@ -140,7 +135,7 @@ static void exit_usage (char *name) #endif " Step "COLLECTD_STEP" seconds\n" " Heartbeat "COLLECTD_HEARTBEAT" seconds\n" - "\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n" + "\n"PACKAGE" "VERSION", http://collectd.org/\n" "by Florian octo Forster \n" "for contributions see `AUTHORS'\n"); exit (0); @@ -437,7 +432,7 @@ int main (int argc, char **argv) #if HAVE_LIBRRD if (operating_mode == MODE_SERVER) start_server (); - else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */ + else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL || operating_mode == MODE_LOG) */ #endif start_client ();