diff --git a/src/collectd.c b/src/collectd.c
index 6513cd4997093107e1b9d9d971edcdd195beb161..1b44e1537153afbef6edc546739c6a174791d961 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
/**
* 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
#include "plugin.h"
#include "configfile.h"
-#include "ping.h"
-
static int loop = 0;
#if HAVE_LIBKSTAT
* exported variables
*/
time_t curtime;
-
-#if HAVE_LIBRRD
-int operating_mode;
-#endif
+int operating_mode;
static void sigIntHandler (int signal)
{
#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 <octo@verplant.org>\n"
"for contributions see `AUTHORS'\n");
exit (0);
#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 ();
if (gettimeofday (&tv_now, NULL) < 0)
#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 ();