From 6a159bf5dc0ebc0f06f18ca170ac7378fe3bc037 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sun, 26 Apr 2015 17:50:36 +1000 Subject: [PATCH] We won't get no error if we are not testing fd -1 sockets any more, and use errno for consistent parsing of socket close errors --- src/connector.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/connector.c b/src/connector.c index 6e469e29..2c1fb215 100644 --- a/src/connector.c +++ b/src/connector.c @@ -521,11 +521,11 @@ void *receiver(void *arg) /* See what type of error this is and raise the log * level of the message if it's unexpected. */ getsockopt(client->fd, SOL_SOCKET, SO_ERROR, (void *)&error, &errlen); - if (error && error != 104) { - LOGNOTICE("Client id %"PRId64" fd %d epollerr HUP in epoll with error %d: %s", + if (error != 104) { + LOGNOTICE("Client id %"PRId64" fd %d epollerr HUP in epoll with errno %d: %s", client->id, client->fd, error, strerror(error)); } else { - LOGINFO("Client id %"PRId64" fd %d epollerr HUP in epoll with error %d: %s", + LOGINFO("Client id %"PRId64" fd %d epollerr HUP in epoll with errno %d: %s", client->id, client->fd, error, strerror(error)); } invalidate_client(cdata->pi->ckp, cdata, client);