From e39ab01903211dfb08bba3c8d55e8303ef891e37 Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Fri, 11 May 2012 00:17:02 +0930 Subject: [PATCH] Reduce monitor.c debug output a bit --- monitor.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 4bd9ffff..e0300787 100644 --- a/monitor.c +++ b/monitor.c @@ -230,7 +230,7 @@ int monitor_poll() fcntl(monitor_named_socket,F_SETFL, fcntl(monitor_named_socket, F_GETFL, NULL)|O_NONBLOCK); } - DEBUG_perror("accept"); //XXX + if (errno != EAGAIN) WHY_perror("accept"); /* Read from any open connections */ int i; @@ -256,12 +256,16 @@ int monitor_poll() DEBUG("read"); //XXX bytes=read(c->socket,&c->line[c->line_length],1); if (bytes<1) { - DEBUG_perror("read"); //XXX switch(errno) { - case EAGAIN: case EINTR: case ENOTRECOVERABLE: + case EINTR: + case ENOTRECOVERABLE: /* transient errors */ + WHY_perror("read"); + break; + case EAGAIN: break; default: + WHY_perror("read"); /* all other errors; close socket */ WHYF("Tearing down monitor client #%d due to errno=%d (%s)", i,errno,strerror(errno)?strerror(errno):"");