projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network plugin: Don't blindly re-initialize everything in the init callback.
[collectd.git]
/
src
/
hddtemp.c
diff --git
a/src/hddtemp.c
b/src/hddtemp.c
index
0432de7
..
36ada53
100644
(file)
--- a/
src/hddtemp.c
+++ b/
src/hddtemp.c
@@
-48,9
+48,9
@@
static const char *config_keys[] =
{
"Host",
"Port",
{
"Host",
"Port",
- NULL
+ "TranslateDevicename"
};
};
-static int config_keys_num =
2
;
+static int config_keys_num =
STATIC_ARRAY_SIZE (config_keys)
;
typedef struct hddname
{
typedef struct hddname
{
@@
-63,6
+63,7
@@
typedef struct hddname
static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
static char hddtemp_port[16];
static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
static char hddtemp_port[16];
+static int translate_devicename = 1;
/*
* NAME
/*
* NAME
@@
-120,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))
@@
-132,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];
- DEBUG ("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;
@@
-160,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);
}
@@
-177,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);
@@
-191,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);
}
@@
-223,6
+229,15
@@
static int hddtemp_config (const char *key, const char *value)
strncpy (hddtemp_port, value, sizeof (hddtemp_port));
hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
}
strncpy (hddtemp_port, value, sizeof (hddtemp_port));
hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
}
+ else if (strcasecmp (key, "TranslateDevicename") == 0)
+ {
+ if ((strcasecmp ("true", value) == 0)
+ || (strcasecmp ("yes", value) == 0)
+ || (strcasecmp ("on", value) == 0))
+ translate_devicename = 1;
+ else
+ translate_devicename = 0;
+ }
else
{
return (-1);
else
{
return (-1);
@@
-263,7
+278,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)
{
@@
-304,6
+319,7
@@
static int hddtemp_init (void)
case SCSI_DISK5_MAJOR:
case SCSI_DISK6_MAJOR:
case SCSI_DISK7_MAJOR:
case SCSI_DISK5_MAJOR:
case SCSI_DISK6_MAJOR:
case SCSI_DISK7_MAJOR:
+#ifdef SCSI_DISK8_MAJOR
case SCSI_DISK8_MAJOR:
case SCSI_DISK9_MAJOR:
case SCSI_DISK10_MAJOR:
case SCSI_DISK8_MAJOR:
case SCSI_DISK9_MAJOR:
case SCSI_DISK10_MAJOR:
@@
-312,6
+328,7
@@
static int hddtemp_init (void)
case SCSI_DISK13_MAJOR:
case SCSI_DISK14_MAJOR:
case SCSI_DISK15_MAJOR:
case SCSI_DISK13_MAJOR:
case SCSI_DISK14_MAJOR:
case SCSI_DISK15_MAJOR:
+#endif /* SCSI_DISK8_MAJOR */
/* SCSI disks minors are multiples of 16.
* Keep only those. */
if (minor % 16)
/* SCSI disks minors are multiples of 16.
* Keep only those. */
if (minor % 16)
@@
-337,25
+354,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;
@@
-378,7
+395,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 */
@@
-388,14
+405,14
@@
static int hddtemp_init (void)
} /* int hddtemp_init */
/*
} /* int hddtemp_init */
/*
- * hddtemp_get_
name
+ * hddtemp_get_
major_minor
*
* Description:
* Try to "cook" a bit the drive name as returned
* by the hddtemp daemon. The intend is to transform disk
* names into <major>-<minor> when possible.
*/
*
* Description:
* Try to "cook" a bit the drive name as returned
* by the hddtemp daemon. The intend is to transform disk
* names into <major>-<minor> when possible.
*/
-static char *hddtemp_get_
name
(char *drive)
+static char *hddtemp_get_
major_minor
(char *drive)
{
hddname_t *list;
char *ret;
{
hddname_t *list;
char *ret;
@@
-406,7
+423,7
@@
static char *hddtemp_get_name (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));
}
return (strdup (drive));
}
@@
-470,7
+487,7
@@
static int hddtemp_read (void)
for (i = 0; i < num_disks; i++)
{
for (i = 0; i < num_disks; i++)
{
- char *name, *
submit_name
;
+ char *name, *
major_minor
;
double temperature;
char *mode;
double temperature;
char *mode;
@@
-487,10
+504,11
@@
static int hddtemp_read (void)
if (mode[0] == 'F')
temperature = (temperature - 32.0) * 5.0 / 9.0;
if (mode[0] == 'F')
temperature = (temperature - 32.0) * 5.0 / 9.0;
- if ((submit_name = hddtemp_get_name (name)) != NULL)
+ if (translate_devicename
+ && (major_minor = hddtemp_get_major_minor (name)) != NULL)
{
{
- hddtemp_submit (
submit_name
, temperature);
- free (
submit_name
);
+ hddtemp_submit (
major_minor
, temperature);
+ free (
major_minor
);
}
else
{
}
else
{