projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.4'
[collectd.git]
/
src
/
hddtemp.c
diff --git
a/src/hddtemp.c
b/src/hddtemp.c
index
651de29
..
a9c0941
100644
(file)
--- a/
src/hddtemp.c
+++ b/
src/hddtemp.c
@@
-121,7
+121,7
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
{
char errbuf[1024];
if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
{
char errbuf[1024];
- ERROR ("hddtemp: getaddrinfo (%s, %s): %s",
+ ERROR ("hddtemp
plugin
: getaddrinfo (%s, %s): %s",
host, port,
(ai_return == EAI_SYSTEM)
? sstrerror (errno, errbuf, sizeof (errbuf))
host, port,
(ai_return == EAI_SYSTEM)
? sstrerror (errno, errbuf, sizeof (errbuf))
@@
-133,19
+133,23
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
/* create our socket descriptor */
for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
/* create our socket descriptor */
- if ((fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol)) < 0)
+ fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
+ ai_ptr->ai_protocol);
+ if (fd < 0)
{
char errbuf[1024];
{
char errbuf[1024];
- ERROR ("hddtemp: socket: %s",
+ ERROR ("hddtemp
plugin
: socket: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
continue;
}
/* connect to the hddtemp daemon */
sstrerror (errno, errbuf, sizeof (errbuf)));
continue;
}
/* connect to the hddtemp daemon */
- if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen))
+ if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr,
+ ai_ptr->ai_addrlen))
{
char errbuf[1024];
{
char errbuf[1024];
- INFO ("hddtemp: connect (%s, %s): %s", host, port,
+ INFO ("hddtemp plugin: connect (%s, %s) failed: %s",
+ host, port,
sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
fd = -1;
sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
fd = -1;
@@
-161,7
+165,7
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
if (fd < 0)
{
if (fd < 0)
{
- ERROR ("hddtemp: Could not connect to daemon.");
+ ERROR ("hddtemp
plugin
: Could not connect to daemon.");
return (-1);
}
return (-1);
}
@@
-178,7
+182,7
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
if ((errno == EAGAIN) || (errno == EINTR))
continue;
if ((errno == EAGAIN) || (errno == EINTR))
continue;
- ERROR ("hddtemp: Error reading from socket: %s",
+ ERROR ("hddtemp
plugin
: Error reading from socket: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
return (-1);
sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
return (-1);
@@
-192,12
+196,13
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
if (buffer_fill >= buffer_size)
{
buffer[buffer_size - 1] = '\0';
if (buffer_fill >= buffer_size)
{
buffer[buffer_size - 1] = '\0';
- WARNING ("hddtemp: Message from hddtemp has been truncated.");
+ WARNING ("hddtemp plugin: Message from hddtemp has been "
+ "truncated.");
}
else if (buffer_fill == 0)
{
}
else if (buffer_fill == 0)
{
- WARNING ("hddtemp
: Peer has unexpectedly shut down the socket.
"
- "Buffer: `%s'", buffer);
+ WARNING ("hddtemp
plugin: Peer has unexpectedly shut down
"
+ "
the socket.
Buffer: `%s'", buffer);
close (fd);
return (-1);
}
close (fd);
return (-1);
}
@@
-218,11
+223,10
@@
static int hddtemp_config (const char *key, const char *value)
{
int port = (int) (atof (value));
if ((port > 0) && (port <= 65535))
{
int port = (int) (atof (value));
if ((port > 0) && (port <= 65535))
- snprintf (hddtemp_port, sizeof (hddtemp_port),
+ s
s
nprintf (hddtemp_port, sizeof (hddtemp_port),
"%i", port);
else
"%i", port);
else
- strncpy (hddtemp_port, value, sizeof (hddtemp_port));
- hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
+ sstrncpy (hddtemp_port, value, sizeof (hddtemp_port));
}
else if (strcasecmp (key, "TranslateDevicename") == 0)
{
}
else if (strcasecmp (key, "TranslateDevicename") == 0)
{
@@
-273,7
+277,7
@@
static int hddtemp_init (void)
if ((fh = fopen ("/proc/partitions", "r")) != NULL)
{
if ((fh = fopen ("/proc/partitions", "r")) != NULL)
{
- DEBUG ("Looking at /proc/partitions...");
+ DEBUG ("
hddtemp plugin:
Looking at /proc/partitions...");
while (fgets (buf, sizeof (buf), fh) != NULL)
{
while (fgets (buf, sizeof (buf), fh) != NULL)
{
@@
-349,25
+353,25
@@
static int hddtemp_init (void)
/* Skip all other majors. */
default:
/* Skip all other majors. */
default:
- DEBUG ("Skipping unknown major %i", major);
+ DEBUG ("
hddtemp plugin:
Skipping unknown major %i", major);
continue;
} /* switch (major) */
if ((name = strdup (fields[3])) == NULL)
{
continue;
} /* switch (major) */
if ((name = strdup (fields[3])) == NULL)
{
- ERROR ("hddtemp: strdup(%s) == NULL", fields[3]);
+ ERROR ("hddtemp
plugin
: strdup(%s) == NULL", fields[3]);
continue;
}
if ((entry = (hddname_t *) malloc (sizeof (hddname_t))) == NULL)
{
continue;
}
if ((entry = (hddname_t *) malloc (sizeof (hddname_t))) == NULL)
{
- ERROR ("hddtemp: malloc (%u) == NULL",
+ ERROR ("hddtemp
plugin
: malloc (%u) == NULL",
(unsigned int) sizeof (hddname_t));
free (name);
continue;
}
(unsigned int) sizeof (hddname_t));
free (name);
continue;
}
- DEBUG ("Found disk: %s (%u:%u).", name, major, minor);
+ DEBUG ("
hddtemp plugin:
Found disk: %s (%u:%u).", name, major, minor);
entry->major = major;
entry->minor = minor;
entry->major = major;
entry->minor = minor;
@@
-390,7
+394,7
@@
static int hddtemp_init (void)
else
{
char errbuf[1024];
else
{
char errbuf[1024];
- DEBUG ("Could not open /proc/partitions: %s",
+ DEBUG ("
hddtemp plugin:
Could not open /proc/partitions: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
}
#endif /* COLLECT_DEBUG */
sstrerror (errno, errbuf, sizeof (errbuf)));
}
#endif /* COLLECT_DEBUG */
@@
-418,14
+422,14
@@
static char *hddtemp_get_major_minor (char *drive)
if (list == NULL)
{
if (list == NULL)
{
- DEBUG ("Don't know %s, keeping name as-is.", drive);
+ DEBUG ("
hddtemp plugin:
Don't know %s, keeping name as-is.", drive);
return (strdup (drive));
}
if ((ret = (char *) malloc (128 * sizeof (char))) == NULL)
return (NULL);
return (strdup (drive));
}
if ((ret = (char *) malloc (128 * sizeof (char))) == NULL)
return (NULL);
- if (snprintf (ret, 128, "%i-%i", list->major, list->minor) >= 128)
+ if (s
s
nprintf (ret, 128, "%i-%i", list->major, list->minor) >= 128)
{
free (ret);
return (NULL);
{
free (ret);
return (NULL);
@@
-446,9
+450,10
@@
static void hddtemp_submit (char *type_instance, double value)
vl.time = time (NULL);
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "hddtemp");
vl.time = time (NULL);
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "hddtemp");
- strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+ strcpy (vl.type, "temperature");
+ sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
- plugin_dispatch_values (
"temperature",
&vl);
+ plugin_dispatch_values (&vl);
}
static int hddtemp_read (void)
}
static int hddtemp_read (void)