projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Reverse patch
[m6w6/libmemcached]
/
libmemcached
/
quit.cc
diff --git
a/libmemcached/quit.cc
b/libmemcached/quit.cc
index fa7599ede2a0f5d4b15e858930ed65531f9444de..ffd4cd459cd767e71537e4e0971546f7fe53d70e 100644
(file)
--- a/
libmemcached/quit.cc
+++ b/
libmemcached/quit.cc
@@
-50,7
+50,7
@@
void memcached_quit_server(memcached_server_st *ptr, bool io_death)
{
if (ptr->fd != INVALID_SOCKET)
{
{
if (ptr->fd != INVALID_SOCKET)
{
- if (io_death == false
&& ptr->type != MEMCACHED_CONNECTION_UDP &&
ptr->options.is_shutting_down == false)
+ if (io_death == false
and memcached_is_udp(ptr->root) == false and
ptr->options.is_shutting_down == false)
{
ptr->options.is_shutting_down= true;
{
ptr->options.is_shutting_down= true;
@@
-100,7
+100,7
@@
void memcached_quit_server(memcached_server_st *ptr, bool io_death)
ptr->state= MEMCACHED_SERVER_STATE_NEW;
ptr->cursor_active= 0;
ptr->io_bytes_sent= 0;
ptr->state= MEMCACHED_SERVER_STATE_NEW;
ptr->cursor_active= 0;
ptr->io_bytes_sent= 0;
- ptr->write_buffer_offset=
(size_t) ((ptr->type == MEMCACHED_CONNECTION_UDP
) ? UDP_DATAGRAM_HEADER_LENGTH : 0);
+ ptr->write_buffer_offset=
size_t(ptr->root and memcached_is_udp(ptr->root
) ? UDP_DATAGRAM_HEADER_LENGTH : 0);
ptr->read_buffer_length= 0;
ptr->read_ptr= ptr->read_buffer;
ptr->options.is_shutting_down= false;
ptr->read_buffer_length= 0;
ptr->read_ptr= ptr->read_buffer;
ptr->options.is_shutting_down= false;
@@
-112,8
+112,7
@@
void memcached_quit_server(memcached_server_st *ptr, bool io_death)
if (io_death)
{
if (io_death)
{
- ptr->server_failure_counter++;
- set_last_disconnected_host(ptr);
+ memcached_mark_server_for_timeout(ptr);
}
}
}
}