diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index 33660a92e5268e4e71a9ea31aa87c1348718ea12..6b3cfc5e0bd13a926bd8465773b90058a56b0cf8 100644 (file)
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
#include "collectd.h"
#include "common.h"
#include "plugin.h"
-#include "utils_debug.h"
#if HAVE_CTYPE_H
# include <ctype.h>
status = IOMasterPort (MACH_PORT_NULL, &io_master_port);
if (status != kIOReturnSuccess)
{
- syslog (LOG_ERR, "IOMasterPort failed: %s",
+ ERROR ("IOMasterPort failed: %s",
mach_error_string (status));
io_master_port = MACH_PORT_NULL;
return (-1);
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- DBG ("type = %s; type_instance = %s; val = %f;",
+ DEBUG ("type = %s; type_instance = %s; val = %f;",
type, type_instance, val);
values[0].gauge = val;
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- strcpy (vl.host, hostname);
+ strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "apple_sensors");
strcpy (vl.plugin_instance, "");
strcpy (vl.type_instance, type_instance);
&iterator);
if (status != kIOReturnSuccess)
{
- syslog (LOG_ERR, "IOServiceGetMatchingServices failed: %s",
+ ERROR ("IOServiceGetMatchingServices failed: %s",
mach_error_string (status));
return (-1);
}
kNilOptions);
if (status != kIOReturnSuccess)
{
- DBG ("IORegistryEntryCreateCFProperties failed: %s",
+ DEBUG ("IORegistryEntryCreateCFProperties failed: %s",
mach_error_string (status));
continue;
}
}
else
{
- DBG ("apple_sensors: Read unknown sensor type: %s",
+ DEBUG ("apple_sensors: Read unknown sensor type: %s",
type);
value_double = (double) value_int;
}
} /* int as_read */
#endif /* IOKIT_HAVE_READ */
-void module_register (void)
+void module_register (modreg_e load)
{
- plugin_register_data_set (&fanspeed_ds);
- plugin_register_data_set (&temperature_ds);
+ if (load & MR_DATASETS)
+ {
+ plugin_register_data_set (&fanspeed_ds);
+ plugin_register_data_set (&temperature_ds);
+ }
#if IOKIT_HAVE_READ
- plugin_register_init ("apple_sensors", as_init);
- plugin_register_read ("apple_sensors", as_read);
+ if (load & MR_READ)
+ {
+ plugin_register_init ("apple_sensors", as_init);
+ plugin_register_read ("apple_sensors", as_read);
+ }
#endif /* IOKIT_HAVE_READ */
-}
+} /* void module_register */