Skip to content

Commit

Permalink
Don't print out warnings if socket is closed
Browse files Browse the repository at this point in the history
Change-Id: I847f11ff1e0d4341f3757106bee488e7e46e496e
Reviewed-on: http://review.couchbase.org/32678
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
  • Loading branch information
trondn committed Jan 21, 2014
1 parent 77070e1 commit 104d60a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions memcached.c
Original file line number Diff line number Diff line change
Expand Up @@ -3665,7 +3665,7 @@ void drive_machine(conn *c) {
break;
}
/* otherwise we have a real error, on which we close the connection */
if (settings.verbose > 0) {
if (!is_closed_conn(error) && settings.verbose > 0) {
moxi_log_write("Failed to read, and not due to blocking:\n"
"errno: %d %s \n"
"rcurr=%lx ritem=%lx rbuf=%lx rlbytes=%d rsize=%d\n",
Expand Down Expand Up @@ -3723,8 +3723,9 @@ void drive_machine(conn *c) {
break;
}
/* otherwise we have a real error, on which we close the connection */
if (settings.verbose > 0)
if (!is_closed_conn(error) && settings.verbose > 0) {
moxi_log_write("Failed to read, and not due to blocking\n");
}
conn_set_state(c, conn_closing);
break;

Expand Down

0 comments on commit 104d60a

Please sign in to comment.