Mercurial > dovecot > core-2.2
diff src/lib-program-client/program-client.c @ 20902:ff8afcb96349
lib-program-client: Use milliseconds in idle timeout
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Sat, 15 Oct 2016 13:59:45 +0300 |
| parents | 197c817bb7c1 |
| children | d9208e0f8b08 |
line wrap: on
line diff
--- a/src/lib-program-client/program-client.c Mon Oct 17 09:09:23 2016 +0300 +++ b/src/lib-program-client/program-client.c Sat Oct 15 13:59:45 2016 +0300 @@ -56,15 +56,15 @@ static void program_client_timeout(struct program_client *pclient) { - i_error("program `%s' execution timed out (> %d secs)", - pclient->path, pclient->set.input_idle_timeout_secs); + i_error("program `%s' execution timed out (> %u msecs)", + pclient->path, pclient->set.input_idle_timeout_msecs); program_client_fail(pclient, PROGRAM_CLIENT_ERROR_RUN_TIMEOUT); } static void program_client_connect_timeout(struct program_client *pclient) { - i_error("program `%s' socket connection timed out (> %d msecs)", + i_error("program `%s' socket connection timed out (> %u msecs)", pclient->path, pclient->set.client_connect_timeout_msecs); program_client_fail(pclient, PROGRAM_CLIENT_ERROR_CONNECT_TIMEOUT); } @@ -369,13 +369,13 @@ { int ret = 1; - pclient->start_time = ioloop_time; + pclient->start_time = ioloop_timeval; if (pclient->to != NULL) timeout_remove(&pclient->to); - if (pclient->set.input_idle_timeout_secs != 0) { + if (pclient->set.input_idle_timeout_msecs != 0) { pclient->to = - timeout_add(pclient->set.input_idle_timeout_secs * - 1000, program_client_timeout, pclient); + timeout_add(pclient->set.input_idle_timeout_msecs, + program_client_timeout, pclient); } /* run output */