From 5cb85a03d0b345c06b8e3f9eceb73ca4284f0bce Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 6 Oct 2016 13:39:21 +0300 Subject: [PATCH] log: Minor error logging and comment improvement. --- src/log/log-connection.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/log/log-connection.c b/src/log/log-connection.c index 87f8ece211..e963316751 100644 --- a/src/log/log-connection.c +++ b/src/log/log-connection.c @@ -283,9 +283,13 @@ static int log_connection_handshake(struct log_connection *log) size_t size; ssize_t ret; + /* we're reading from a FIFO, so we're assuming that we're getting a + full handshake packet immediately. if not, treat it as an error + message that we want to log. */ ret = i_stream_read(log->input); if (ret < 0) { - i_error("read(log %s) failed: %m", log->default_prefix); + i_error("read(log %s) failed: %s", log->default_prefix, + i_stream_get_error(log->input)); return -1; } if ((size_t)ret < sizeof(handshake)) { @@ -336,6 +340,9 @@ static void log_connection_input(struct log_connection *log) log_connection_destroy(log); return; } + /* come back here even if we read something else besides a + handshake. the first few lines could be coming from e.g. + libc before the proper handshake line is sent. */ } io_loop_time_refresh();