]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
director: Fix "sending handshake timed out" error to be actually logged
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Wed, 31 May 2017 10:15:04 +0000 (13:15 +0300)
committerVille Savolainen <ville.savolainen@dovecot.fi>
Mon, 19 Jun 2017 11:28:27 +0000 (14:28 +0300)
io was never NULL here, so it was never logged.

src/director/director-connection.c

index 9b631d658afc95e0dc3d465fdcae05c4ffde4119..e99b17fe6a2353e5653dbed3bd1e842ecbb46335 100644 (file)
@@ -166,12 +166,12 @@ director_connection_init_timeout(struct director_connection *conn)
        if (!conn->connected) {
                i_error("director(%s): Connect timed out (%u secs)",
                        conn->name, secs);
-       } else if (conn->io == NULL) {
-               i_error("director(%s): Sending handshake (%u secs)",
-                       conn->name, secs);
        } else if (!conn->me_received) {
                i_error("director(%s): Handshaking ME timed out (%u secs)",
                        conn->name, secs);
+       } else if (!conn->in) {
+               i_error("director(%s): Sending handshake timed out (%u secs)",
+                       conn->name, secs);
        } else {
                i_error("director(%s): Handshaking DONE timed out (%u secs)",
                        conn->name, secs);