projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
77732cd
)
ntpd plugin: Report failures of "ntpd_do_query" as *errors*, not debug messages.
author
Florian Forster
<octo@huhu.verplant.org>
Fri, 28 Jan 2011 08:18:16 +0000
(09:18 +0100)
committer
Florian Forster
<octo@huhu.verplant.org>
Fri, 28 Jan 2011 08:18:16 +0000
(09:18 +0100)
src/ntpd.c
patch
|
blob
|
history
diff --git
a/src/ntpd.c
b/src/ntpd.c
index
ecc87c7
..
8bbf74d
100644
(file)
--- a/
src/ntpd.c
+++ b/
src/ntpd.c
@@
-784,15
+784,15
@@
static int ntpd_read (void)
0, 0, NULL, /* request data */
&ik_num, &ik_size, (char **) ((void *) &ik), /* response data */
sizeof (struct info_kernel));
0, 0, NULL, /* request data */
&ik_num, &ik_size, (char **) ((void *) &ik), /* response data */
sizeof (struct info_kernel));
-
if (status != 0)
{
if (status != 0)
{
-
DEBUG ("ntpd_do_query
failed with status %i", status);
- return (
-1
);
+
ERROR ("ntpd plugin: ntpd_do_query (REQ_GET_KERNEL)
failed with status %i", status);
+ return (
status
);
}
}
- if ((ik == NULL) || (ik_num == 0) || (ik_size == 0))
+
else
if ((ik == NULL) || (ik_num == 0) || (ik_size == 0))
{
{
- DEBUG ("ntpd_do_query returned: ik = %p; ik_num = %i; ik_size = %i;",
+ ERROR ("ntpd plugin: ntpd_do_query returned unexpected data. "
+ "(ik = %p; ik_num = %i; ik_size = %i)",
(void *) ik, ik_num, ik_size);
return (-1);
}
(void *) ik, ik_num, ik_size);
return (-1);
}
@@
-820,12
+820,13
@@
static int ntpd_read (void)
sizeof (struct info_peer_summary));
if (status != 0)
{
sizeof (struct info_peer_summary));
if (status != 0)
{
-
DEBUG ("ntpd_do_query
failed with status %i", status);
- return (
-1
);
+
ERROR ("ntpd plugin: ntpd_do_query (REQ_PEER_LIST_SUM)
failed with status %i", status);
+ return (
status
);
}
}
- if ((ps == NULL) || (ps_num == 0) || (ps_size == 0))
+
else
if ((ps == NULL) || (ps_num == 0) || (ps_size == 0))
{
{
- DEBUG ("ntpd_do_query returned: ps = %p; ps_num = %i; ps_size = %i;",
+ ERROR ("ntpd plugin: ntpd_do_query returned unexpected data. "
+ "(ps = %p; ps_num = %i; ps_size = %i)",
(void *) ps, ps_num, ps_size);
return (-1);
}
(void *) ps, ps_num, ps_size);
return (-1);
}