diff options
| author | Brian Aker <brian@tangent.org> | 2014-02-05 02:56:29 -0800 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2014-02-05 02:56:29 -0800 |
| commit | 2a78a93f72ee23b3dbc3b7399610e1ba16430bec (patch) | |
| tree | 4bf6c6056350f05006f6f1fe6fe609ab05eb0e55 /libmemcached/server.hpp | |
| parent | ac1e4e0457318672338f2a9cbaaf63c703500ddd (diff) | |
| parent | e53cf23b9eb7b0fe5125290b7cefc0d0d0cb12b5 (diff) | |
| download | libmemcached-2a78a93f72ee23b3dbc3b7399610e1ba16430bec.tar.gz | |
Merge from 1.0
Diffstat (limited to 'libmemcached/server.hpp')
| -rw-r--r-- | libmemcached/server.hpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libmemcached/server.hpp b/libmemcached/server.hpp index 708e6460..6ea0b7f2 100644 --- a/libmemcached/server.hpp +++ b/libmemcached/server.hpp @@ -76,7 +76,13 @@ static inline void memcached_mark_server_for_timeout(memcached_instance_st* serv { if (server->state != MEMCACHED_SERVER_STATE_IN_TIMEOUT) { - if (server->root->retry_timeout != 0) + if (server->server_timeout_counter_query_id != server->root->query_id) + { + server->server_timeout_counter++; + server->server_timeout_counter_query_id= server->root->query_id; + } + + if (server->server_timeout_counter >= server->root->server_timeout_limit) { struct timeval next_time; if (gettimeofday(&next_time, NULL) == 0) @@ -89,12 +95,12 @@ static inline void memcached_mark_server_for_timeout(memcached_instance_st* serv } server->state= MEMCACHED_SERVER_STATE_IN_TIMEOUT; + if (server->server_failure_counter_query_id != server->root->query_id) + { + server->server_failure_counter++; + server->server_failure_counter_query_id= server->root->query_id; + } + set_last_disconnected_host(server); } - if (server->server_failure_counter_query_id != server->root->query_id) - { - server->server_failure_counter++; - server->server_failure_counter_query_id= server->root->query_id; - } - set_last_disconnected_host(server); } } |