projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
900fd12
)
Beautifying many debug messages..
collectd-4.0
author
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:32:53 +0000
(18:32 +0200)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:32:53 +0000
(18:32 +0200)
src/network.c
patch
|
blob
|
history
src/processes.c
patch
|
blob
|
history
src/rrdtool.c
patch
|
blob
|
history
src/unixsock.c
patch
|
blob
|
history
src/utils_ignorelist.c
patch
|
blob
|
history
src/utils_mount.c
patch
|
blob
|
history
diff --git
a/src/network.c
b/src/network.c
index
5ae36c1
..
164759b
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-1084,7
+1084,6
@@
static int add_to_buffer (char *buffer, int buffer_size,
vl->host, strlen (vl->host)) != 0)
return (-1);
strcpy (vl_def->host, vl->host);
vl->host, strlen (vl->host)) != 0)
return (-1);
strcpy (vl_def->host, vl->host);
- DEBUG ("network plugin: add_to_buffer: host = %s", vl->host);
}
if (vl_def->time != vl->time)
}
if (vl_def->time != vl->time)
@@
-1093,8
+1092,6
@@
static int add_to_buffer (char *buffer, int buffer_size,
(uint64_t) vl->time))
return (-1);
vl_def->time = vl->time;
(uint64_t) vl->time))
return (-1);
vl_def->time = vl->time;
- DEBUG ("network plugin: add_to_buffer: time = %u",
- (unsigned int) vl->time);
}
if (strcmp (vl_def->plugin, vl->plugin) != 0)
}
if (strcmp (vl_def->plugin, vl->plugin) != 0)
@@
-1103,8
+1100,6
@@
static int add_to_buffer (char *buffer, int buffer_size,
vl->plugin, strlen (vl->plugin)) != 0)
return (-1);
strcpy (vl_def->plugin, vl->plugin);
vl->plugin, strlen (vl->plugin)) != 0)
return (-1);
strcpy (vl_def->plugin, vl->plugin);
- DEBUG ("network plugin: add_to_buffer: plugin = %s",
- vl->plugin);
}
if (strcmp (vl_def->plugin_instance, vl->plugin_instance) != 0)
}
if (strcmp (vl_def->plugin_instance, vl->plugin_instance) != 0)
@@
-1114,8
+1109,6
@@
static int add_to_buffer (char *buffer, int buffer_size,
strlen (vl->plugin_instance)) != 0)
return (-1);
strcpy (vl_def->plugin_instance, vl->plugin_instance);
strlen (vl->plugin_instance)) != 0)
return (-1);
strcpy (vl_def->plugin_instance, vl->plugin_instance);
- DEBUG ("network plugin: add_to_buffer: plugin_instance = %s",
- vl->plugin_instance);
}
if (strcmp (type_def, ds->type) != 0)
}
if (strcmp (type_def, ds->type) != 0)
@@
-1124,7
+1117,6
@@
static int add_to_buffer (char *buffer, int buffer_size,
ds->type, strlen (ds->type)) != 0)
return (-1);
strcpy (type_def, ds->type);
ds->type, strlen (ds->type)) != 0)
return (-1);
strcpy (type_def, ds->type);
- DEBUG ("network plugin: add_to_buffer: type = %s", ds->type);
}
if (strcmp (vl_def->type_instance, vl->type_instance) != 0)
}
if (strcmp (vl_def->type_instance, vl->type_instance) != 0)
@@
-1134,8
+1126,6
@@
static int add_to_buffer (char *buffer, int buffer_size,
strlen (vl->type_instance)) != 0)
return (-1);
strcpy (vl_def->type_instance, vl->type_instance);
strlen (vl->type_instance)) != 0)
return (-1);
strcpy (vl_def->type_instance, vl->type_instance);
- DEBUG ("network plugin: add_to_buffer: type_instance = %s",
- vl->type_instance);
}
if (write_part_values (&buffer, &buffer_size, ds, vl) != 0)
}
if (write_part_values (&buffer, &buffer_size, ds, vl) != 0)
diff --git
a/src/processes.c
b/src/processes.c
index
954cd0d
..
5d257f5
100644
(file)
--- a/
src/processes.c
+++ b/
src/processes.c
@@
-614,8
+614,8
@@
int ps_read_process (int pid, procstat_t *ps, char *state)
/* Leave the rest at zero if this is only a zombi */
if (ps->num_proc == 0)
{
/* Leave the rest at zero if this is only a zombi */
if (ps->num_proc == 0)
{
- DEBUG ("
This is only a zombi: pid = %i; name = %s;",
- pid, ps->name);
+ DEBUG ("
processes plugin: This is only a zombi: pid = %i; "
+
"name = %s;",
pid, ps->name);
return (0);
}
return (0);
}
diff --git
a/src/rrdtool.c
b/src/rrdtool.c
index
820ccdc
..
8ad0106
100644
(file)
--- a/
src/rrdtool.c
+++ b/
src/rrdtool.c
@@
-594,7
+594,7
@@
static void rrd_cache_flush (int timeout)
if (cache == NULL)
return;
if (cache == NULL)
return;
- DEBUG ("Flushing cache, timeout = %i", timeout);
+ DEBUG ("
rrdtool plugin:
Flushing cache, timeout = %i", timeout);
now = time (NULL);
now = time (NULL);
@@
-627,7
+627,7
@@
static void rrd_cache_flush (int timeout)
{
if (avl_remove (cache, keys[i], (void *) &key, (void *) &rc) != 0)
{
{
if (avl_remove (cache, keys[i], (void *) &key, (void *) &rc) != 0)
{
- DEBUG ("avl_remove (%s) failed.", keys[i]);
+ DEBUG ("
rrdtool plugin:
avl_remove (%s) failed.", keys[i]);
continue;
}
continue;
}
@@
-639,7
+639,6
@@
static void rrd_cache_flush (int timeout)
} /* for (i = 0..keys_num) */
free (keys);
} /* for (i = 0..keys_num) */
free (keys);
- DEBUG ("Flushed %i value(s)", keys_num);
cache_flush_last = now;
} /* void rrd_cache_flush */
cache_flush_last = now;
} /* void rrd_cache_flush */
diff --git
a/src/unixsock.c
b/src/unixsock.c
index
734403e
..
ddf4b67
100644
(file)
--- a/
src/unixsock.c
+++ b/
src/unixsock.c
@@
-711,7
+711,7
@@
static void *us_server_thread (void *arg)
while (loop != 0)
{
while (loop != 0)
{
- DEBUG ("Calling accept..");
+ DEBUG ("
unixsock plugin:
Calling accept..");
status = accept (sock_fd, NULL, NULL);
if (status < 0)
{
status = accept (sock_fd, NULL, NULL);
if (status < 0)
{
diff --git
a/src/utils_ignorelist.c
b/src/utils_ignorelist.c
index
d2546aa
..
bf39597
100644
(file)
--- a/
src/utils_ignorelist.c
+++ b/
src/utils_ignorelist.c
@@
-240,8
+240,6
@@
void ignorelist_free (ignorelist_t *il)
ignorelist_item_t *this;
ignorelist_item_t *next;
ignorelist_item_t *this;
ignorelist_item_t *next;
- DEBUG ("(il = 0x%p)", (void *) il);
-
if (il == NULL)
return;
if (il == NULL)
return;
diff --git
a/src/utils_mount.c
b/src/utils_mount.c
index
67d2e33
..
efaa92f
100644
(file)
--- a/
src/utils_mount.c
+++ b/
src/utils_mount.c
@@
-334,7
+334,7
@@
get_spec_by_uuid(const char *s)
return get_spec_by_x(UUID, uuid);
bad_uuid:
return get_spec_by_x(UUID, uuid);
bad_uuid:
- DEBUG("Found an invalid UUID: %s", s);
+ DEBUG("
utils_mount:
Found an invalid UUID: %s", s);
return NULL;
}
return NULL;
}
@@
-353,12
+353,12
@@
static char *get_device_name(const char *optstr)
}
else if (strncmp (optstr, "UUID=", 5) == 0)
{
}
else if (strncmp (optstr, "UUID=", 5) == 0)
{
- DEBUG ("TODO: check UUID= code!");
+ DEBUG ("
utils_mount:
TODO: check UUID= code!");
rc = get_spec_by_uuid (optstr + 5);
}
else if (strncmp (optstr, "LABEL=", 6) == 0)
{
rc = get_spec_by_uuid (optstr + 5);
}
else if (strncmp (optstr, "LABEL=", 6) == 0)
{
- DEBUG ("TODO: check LABEL= code!");
+ DEBUG ("
utils_mount:
TODO: check LABEL= code!");
rc = get_spec_by_volume_label (optstr + 6);
}
else
rc = get_spec_by_volume_label (optstr + 6);
}
else
@@
-368,7
+368,7
@@
static char *get_device_name(const char *optstr)
if(!rc)
{
if(!rc)
{
- DEBUG ("Error checking device name: optstr = %s", optstr);
+ DEBUG ("
utils_mount:
Error checking device name: optstr = %s", optstr);
}
return rc;
}
}
return rc;
}
@@
-384,7
+384,7
@@
static cu_mount_t *cu_mount_listmntent (void)
struct tabmntent *mntlist;
if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) {
char errbuf[1024];
struct tabmntent *mntlist;
if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) {
char errbuf[1024];
- DEBUG("calling listmntent() failed: %s",
+ DEBUG("
utils_mount:
calling listmntent() failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
}
sstrerror (errno, errbuf, sizeof (errbuf)));
}
@@
-396,7
+396,7
@@
static cu_mount_t *cu_mount_listmntent (void)
if(loop == NULL) { /* no loop= mount */
device = get_device_name(mnt->mnt_fsname);
if(device == NULL) {
if(loop == NULL) { /* no loop= mount */
device = get_device_name(mnt->mnt_fsname);
if(device == NULL) {
- DEBUG("can't get devicename for fs (%s) %s (%s)"
+ DEBUG("
utils_mount:
can't get devicename for fs (%s) %s (%s)"
": ignored", mnt->mnt_type,
mnt->mnt_dir, mnt->mnt_fsname);
continue;
": ignored", mnt->mnt_type,
mnt->mnt_dir, mnt->mnt_fsname);
continue;
@@
-455,7
+455,7
@@
static cu_mount_t *cu_mount_getfsstat (void)
if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
{
char errbuf[1024];
if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
{
char errbuf[1024];
- DEBUG ("getv?fsstat failed: %s",
+ DEBUG ("
utils_mount:
getv?fsstat failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
return (NULL);
}
sstrerror (errno, errbuf, sizeof (errbuf)));
return (NULL);
}
@@
-470,7
+470,7
@@
static cu_mount_t *cu_mount_getfsstat (void)
if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
char errbuf[1024];
if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
char errbuf[1024];
- DEBUG ("getv?fsstat failed: %s",
+ DEBUG ("
utils_mount:
getv?fsstat failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
free (buf);
return (NULL);
sstrerror (errno, errbuf, sizeof (errbuf)));
free (buf);
return (NULL);
@@
-520,7
+520,7
@@
static cu_mount_t *cu_mount_gen_getmntent (void)
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
- DEBUG ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
+ DEBUG ("
utils_mount:
(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
if ((fp = fopen (COLLECTD_MNTTAB, "r")) == NULL)
{
if ((fp = fopen (COLLECTD_MNTTAB, "r")) == NULL)
{
@@
-577,7
+577,7
@@
static cu_mount_t *cu_mount_getmntent (void)
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
- DEBUG ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
+ DEBUG ("
utils_mount:
(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL)
{
if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL)
{
@@
-601,7
+601,7
@@
static cu_mount_t *cu_mount_getmntent (void)
new->device = get_device_name (new->options);
new->next = NULL;
new->device = get_device_name (new->options);
new->next = NULL;
- DEBUG ("new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}",
+ DEBUG ("
utils_mount:
new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}",
new->dir, new->spec_device, new->type, new->options, new->device);
/* Append to list */
new->dir, new->spec_device, new->type, new->options, new->device);
/* Append to list */
@@
-619,7
+619,7
@@
static cu_mount_t *cu_mount_getmntent (void)
endmntent (fp);
endmntent (fp);
- DEBUG ("return (0x%p)", (void *) first);
+ DEBUG ("
utils_mount:
return (0x%p)", (void *) first);
return (first);
}
return (first);
}
@@
-682,8
+682,6
@@
void cu_mount_freelist (cu_mount_t *list)
cu_mount_t *this;
cu_mount_t *next;
cu_mount_t *this;
cu_mount_t *next;
- DEBUG ("(list = 0x%p)", (void *) list);
-
for (this = list; this != NULL; this = next)
{
next = this->next;
for (this = list; this != NULL; this = next)
{
next = this->next;