]> 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)
committerGitLab <gitlab@git.dovecot.net>
Sun, 4 Jun 2017 16:27:04 +0000 (19:27 +0300)
io was never NULL here, so it was never logged.

src/director/director-connection.c

index 7c1d77f20bed6adcccf9b06b812cd705e645b5f7..21d2f0d10c47dd0368060093041c02bbfb7dbbb5 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);