if (gettimeofday (&time_end, NULL) < 0)
{
- syslog (LOG_ERR, "multimeter plugin: gettimeofday failed: %s",
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("multimeter plugin: gettimeofday failed: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
time_end.tv_sec++;
if (gettimeofday (&time_now, NULL) < 0)
{
- syslog (LOG_ERR, "multimeter plugin: "
+ char errbuf[1024];
+ ERROR ("multimeter plugin: "
"gettimeofday failed: %s",
- strerror (errno));
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
if (multimeter_timeval_sub (&time_end, &time_now, &timeout) == -1)
}
else /* status == -1 */
{
- syslog (LOG_ERR, "multimeter plugin: "
+ char errbuf[1024];
+ ERROR ("multimeter plugin: "
"select failed: %s",
- strerror (errno));
+ sstrerror (errno, errbuf, sizeof (errbuf)));
break;
}
}
}
else
{
- syslog (LOG_INFO, "multimeter plugin: Device "
+ INFO ("multimeter plugin: Device "
"found at %s", device);
return (0);
}
}
}
- syslog (LOG_ERR, "multimeter plugin: No device found");
+ ERROR ("multimeter plugin: No device found");
return (-1);
}
#undef LINE_LENGTH
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- strcpy (vl.host, hostname);
+ strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "multimeter");
plugin_dispatch_values ("multimeter", &vl);
}
#endif /* MULTIMETER_HAVE_READ */
-void module_register (void)
+void module_register (modreg_e load)
{
- plugin_register_data_set (&data_set);
+ if (load & MR_DATASETS)
+ plugin_register_data_set (&data_set);
#if MULTIMETER_HAVE_READ
- plugin_register_init ("multimeter", multimeter_init);
- plugin_register_read ("multimeter", multimeter_read);
- plugin_register_shutdown ("multimeter", multimeter_shutdown);
+ if (load & MR_READ)
+ {
+ plugin_register_init ("multimeter", multimeter_init);
+ plugin_register_read ("multimeter", multimeter_read);
+ plugin_register_shutdown ("multimeter", multimeter_shutdown);
+ }
#endif /* MULTIMETER_HAVE_READ */
-}
+} /* void module_register */