Let plugin_dispatch_values() set value_list.time in case of 'now'.

[collectd.git] / src / users.c

diff --git a/src/users.c b/src/users.c
index afe26e1..b605ff8 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -23,6 +23,10 @@
 #include "common.h"
 #include "plugin.h"
 
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif /* HAVE_STATGRAB_H */
+
 #if HAVE_UTMPX_H
 # include <utmpx.h>
 /* #endif HAVE_UTMPX_H */
@@ -44,11 +48,11 @@ static void users_submit (gauge_t value)
 
        vl.values = values;
        vl.values_len = 1;
-       vl.time = time (NULL);
-       strcpy (vl.host, hostname_g);
-       strcpy (vl.plugin, "users");
+       sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+       sstrncpy (vl.plugin, "users", sizeof (vl.plugin));
+       sstrncpy (vl.type, "users", sizeof (vl.plugin));
 
-       plugin_dispatch_values ("users", &vl);
+       plugin_dispatch_values (&vl);
 } /* void users_submit */
 
 static int users_read (void)
@@ -89,6 +93,16 @@ static int users_read (void)
        users_submit (users);
 /* #endif HAVE_GETUTENT */
 
+#elif HAVE_LIBSTATGRAB
+       sg_user_stats *us;
+
+       us = sg_get_user_stats ();
+       if (us == NULL)
+               return (-1);   
+
+       users_submit ((gauge_t) us->num_entries);
+/* #endif HAVE_LIBSTATGRAB */
+
 #else
 # error "No applicable input method."
 #endif