nut plugin: Reconnect to the server if the connection is lost.

[collectd.git] / src / apple_sensors.c

diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index 29d509157723e7939acbf2988ad899764025010e..6b3cfc5e0bd13a926bd8465773b90058a56b0cf8 100644 (file)
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
@@ -22,7 +22,6 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "utils_debug.h"
 
 #if HAVE_CTYPE_H
 #  include <ctype.h>
@@ -95,7 +94,7 @@ static int as_init (void)
        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);
@@ -110,7 +109,7 @@ static void as_submit (const char *type, const char *type_instance,
        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;
@@ -148,7 +147,7 @@ static int as_read (void)
                        &iterator);
        if (status != kIOReturnSuccess)
                {
-               syslog (LOG_ERR, "IOServiceGetMatchingServices failed: %s",
+               ERROR ("IOServiceGetMatchingServices failed: %s",
                                mach_error_string (status));
                return (-1);
        }
@@ -162,7 +161,7 @@ static int as_read (void)
                                kNilOptions);
                if (status != kIOReturnSuccess)
                {
-                       DBG ("IORegistryEntryCreateCFProperties failed: %s",
+                       DEBUG ("IORegistryEntryCreateCFProperties failed: %s",
                                        mach_error_string (status));
                        continue;
                }
@@ -246,7 +245,7 @@ static int as_read (void)
                }
                else
                {
-                       DBG ("apple_sensors: Read unknown sensor type: %s",
+                       DEBUG ("apple_sensors: Read unknown sensor type: %s",
                                        type);
                        value_double = (double) value_int;
                }
@@ -263,13 +262,19 @@ static int as_read (void)
 } /* 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 */