#define HDDTEMP_DEF_HOST "127.0.0.1"
#define HDDTEMP_DEF_PORT "7634"
-static data_source_t data_source_temperature[1] =
-{
- {"value", DS_TYPE_GAUGE, -273.15, NAN}
-};
-
-static data_set_t temperature_ds =
-{
- "temperature", 1, data_source_temperature
-};
-
#if HDDTEMP_HAVE_READ
static const char *config_keys[] =
{
static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
-static char *hddtemp_port = NULL;
+static char hddtemp_port[16];
/*
* NAME
host = HDDTEMP_DEF_HOST;
port = hddtemp_port;
- if (port == NULL)
+ if (strlen (port) == 0)
port = HDDTEMP_DEF_PORT;
if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
{
+ char errbuf[1024];
ERROR ("hddtemp: getaddrinfo (%s, %s): %s",
host, port,
- ai_return == EAI_SYSTEM ? strerror (errno) : gai_strerror (ai_return));
+ (ai_return == EAI_SYSTEM)
+ ? sstrerror (errno, errbuf, sizeof (errbuf))
+ : gai_strerror (ai_return));
return (-1);
}
/* create our socket descriptor */
if ((fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol)) < 0)
{
+ char errbuf[1024];
ERROR ("hddtemp: socket: %s",
- strerror (errno));
+ sstrerror (errno, errbuf, sizeof (errbuf)));
continue;
}
/* connect to the hddtemp daemon */
if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen))
{
+ char errbuf[1024];
DEBUG ("hddtemp: connect (%s, %s): %s", host, port,
- strerror (errno));
+ sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
fd = -1;
continue;
{
if (status == -1)
{
+ char errbuf[1024];
+
if ((errno == EAGAIN) || (errno == EINTR))
continue;
ERROR ("hddtemp: Error reading from socket: %s",
- strerror (errno));
+ sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
return (-1);
}
static int hddtemp_config (const char *key, const char *value)
{
- if (strcasecmp (key, "host") == 0)
+ if (strcasecmp (key, "Host") == 0)
{
if (hddtemp_host != NULL)
free (hddtemp_host);
hddtemp_host = strdup (value);
}
- else if (strcasecmp (key, "port") == 0)
+ else if (strcasecmp (key, "Port") == 0)
{
- if (hddtemp_port != NULL)
- free (hddtemp_port);
- hddtemp_port = strdup (value);
+ int port = (int) (atof (value));
+ if ((port > 0) && (port <= 65535))
+ snprintf (hddtemp_port, sizeof (hddtemp_port),
+ "%i", port);
+ else
+ strncpy (hddtemp_port, value, sizeof (hddtemp_port));
+ hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
}
else
{
}
fclose (fh);
}
+#if COLLECT_DEBUG
else
+ {
+ char errbuf[1024];
DEBUG ("Could not open /proc/partitions: %s",
- strerror (errno));
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ }
+#endif /* COLLECT_DEBUG */
#endif /* KERNEL_LINUX */
return (0);
Register collectd plugin. */
void module_register (void)
{
- plugin_register_data_set (&temperature_ds);
-
#if HDDTEMP_HAVE_READ
plugin_register_config ("hddtemp", hddtemp_config,
config_keys, config_keys_num);