diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-07-29 23:23:07 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-07-29 23:26:57 +0200 |
| commit | 2f8228b029d45bc82c89e0e8a86255028bb04cd6 (patch) | |
| tree | 6e129dd1f17e4dd5ccee8065b190cb6e66235d02 | |
| parent | 6a766c18d4329123ca044b4d3668ca763f1d8118 (diff) | |
| download | pingu-2f8228b029d45bc82c89e0e8a86255028bb04cd6.tar.bz2 pingu-2f8228b029d45bc82c89e0e8a86255028bb04cd6.tar.xz | |
pingu: use host label when logging instead of ip addr
| -rw-r--r-- | pingu_host.c | 6 | ||||
| -rw-r--r-- | pingu_ping.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pingu_host.c b/pingu_host.c index 640b928..efc3f43 100644 --- a/pingu_host.c +++ b/pingu_host.c @@ -227,13 +227,11 @@ int pingu_host_set_status(struct pingu_host *host, int status) int route_action = 0; host->burst.active = 0; if (host->status == status) { - log_debug("%s: %s: status is still %i", - host->iface->name, host->host, status); + log_debug("%s: status is still %i", host->label, status); return status; } host->status = status; - log_info("%s: %s: new status: %i", - host->iface->name, host->host, status); + log_info("%s: new status: %i", host->label, status); switch (host->status) { case 0: action = host->down_action; diff --git a/pingu_ping.c b/pingu_ping.c index 5ad0ab2..0f9de04 100644 --- a/pingu_ping.c +++ b/pingu_ping.c @@ -33,7 +33,7 @@ static void pingu_ping_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) { struct pingu_ping *ping = container_of(w, struct pingu_ping, timeout_watcher); - log_debug("%s: seq %i (%i/%i) timed out", ping->host->host, ping->seq, + log_debug("%s: seq %i (%i/%i) timed out", ping->host->label, ping->seq, ping->host->burst.pings_sent, ping->host->max_retries); list_del(&ping->ping_list_entry); pingu_host_verify_status(loop, ping->host); @@ -76,7 +76,7 @@ static void pingu_ping_handle_reply(struct ev_loop *loop, struct pingu_ping *ping) { ping->host->burst.pings_replied++; - log_debug("%s: got seq %i (%i/%i)", ping->host->host, ping->seq, + log_debug("%s: got seq %i (%i/%i)", ping->host->label, ping->seq, ping->host->burst.pings_replied, ping->host->required_replies); list_del(&ping->ping_list_entry); @@ -119,7 +119,6 @@ void pingu_ping_read_reply(struct ev_loop *loop, struct pingu_iface *iface) sizeof(buf)); if (len <= 0) return; - ping = pingu_ping_find((struct icmphdr *) &buf[ip->ihl * 4], &from, &iface->ping_list); if (ping == NULL) |