email plugin: Kill threads before closing the associated socket

If the socket is closed before the thread is terminated it might cause some
confusing error messages if the thread wants to read from the socket.

Signed-off-by: Sebastian Harl <sh@tokkee.org>

diff --git a/src/email.c b/src/email.c
index 377a6b1ea6a5c6faac4fb3462b60fe6f8731e95c..0f9c2f3de016f521b62a2ebfbdd0aaa3a4eb84c9 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -685,15 +685,15 @@ static void email_shutdown (void)
        if (disabled)
                return;
 
-       close (connector_socket);
        pthread_kill (connector, SIGTERM);
+       close (connector_socket);
 
        /* don't allow any more connections to be processed */
        pthread_mutex_lock (&conns_mutex);
 
        for (i = 0; i < max_conns; ++i) {
-               close (collectors[i]->socket);
                pthread_kill (collectors[i]->thread, SIGTERM);
+               close (collectors[i]->socket);
        }
 
        pthread_mutex_unlock (&conns_mutex);