X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmbmon.c;h=bad1a3884d86596b2f5600241ae83c5ee543b69c;hb=b5c5890955fa19651ad8b3f48d99364d270a0d8f;hp=7694abc5dd04e8e39b9ece4015dfece8d7e62195;hpb=7e5df1a2c6611bd4ac9fb8ac4b78106f9139ae6e;p=collectd.git diff --git a/src/mbmon.c b/src/mbmon.c index 7694abc5..bad1a388 100644 --- a/src/mbmon.c +++ b/src/mbmon.c @@ -26,15 +26,10 @@ #include "plugin.h" #include "configfile.h" -#if HAVE_NETDB_H && HAVE_SYS_SOCKET_H && HAVE_NETINET_IN_H && HAVE_NETINET_TCP_H -# include -# include -# include -# include -# define MBMON_HAVE_READ 1 -#else -# define MBMON_HAVE_READ 0 -#endif +#include +#include +#include +#include #define MBMON_DEF_HOST "127.0.0.1" #define MBMON_DEF_PORT "411" /* the default for Debian */ @@ -47,7 +42,6 @@ static const char *config_keys[] = }; static int config_keys_num = 2; -#if MBMON_HAVE_READ static char *mbmon_host = NULL; static char *mbmon_port = NULL; @@ -138,7 +132,7 @@ static int mbmon_query_daemon (char *buffer, int buffer_size) if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen)) { char errbuf[1024]; - DEBUG ("mbmon: connect (%s, %s): %s", host, port, + INFO ("mbmon: connect (%s, %s): %s", host, port, sstrerror (errno, errbuf, sizeof (errbuf))); close (fd); @@ -308,14 +302,11 @@ static int mbmon_read (void) return (0); } /* void mbmon_read */ -#endif /* MBMON_HAVE_READ */ /* module_register Register collectd plugin. */ void module_register (void) { -#if MBMON_HAVE_READ plugin_register_config ("mbmon", mbmon_config, config_keys, config_keys_num); plugin_register_read ("mbmon", mbmon_read); -#endif /* MBMON_HAVE_READ */ } /* void module_register */