X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fquit.c;h=35d434bc6b7886a4634edbec083f5872699278d7;hb=4eaa0bce7fc5f1d48662357d7237d103793783be;hp=a8f70402062d7c1e87a486a2ac54959827091981;hpb=e7561db4b56f2e78948710a0f360f65f5703a8e6;p=awesomized%2Flibmemcached

diff --git a/libmemcached/quit.c b/libmemcached/quit.c
index a8f70402..35d434bc 100644
--- a/libmemcached/quit.c
+++ b/libmemcached/quit.c
@@ -9,26 +9,28 @@
   will force data to be completed.
 */
 
-void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
+void memcached_quit_server(memcached_server_st *ptr, bool io_death)
 {
   if (ptr->fd != -1)
   {
-    if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
+    if (io_death == false && ptr->type != MEMCACHED_CONNECTION_UDP && ptr->options.is_shutting_down == false)
     {
       memcached_return_t rc;
       char buffer[MEMCACHED_MAX_BUFFER];
 
+      ptr->options.is_shutting_down= true;
+
       if (ptr->root->flags.binary_protocol)
       {
         protocol_binary_request_quit request = {.bytes= {0}};
         request.message.header.request.magic = PROTOCOL_BINARY_REQ;
         request.message.header.request.opcode = PROTOCOL_BINARY_CMD_QUIT;
         request.message.header.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
-        rc= memcached_do(ptr, request.bytes, sizeof(request.bytes), 1);
+        rc= memcached_do(ptr, request.bytes, sizeof(request.bytes), true);
       }
       else
       {
-        rc= memcached_do(ptr, "quit\r\n", 6, 1);
+        rc= memcached_do(ptr, "quit\r\n", sizeof("quit\r\n"), true);
       }
 
       WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
@@ -59,9 +61,10 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
   ptr->write_buffer_offset= (size_t) ((ptr->type == MEMCACHED_CONNECTION_UDP) ? UDP_DATAGRAM_HEADER_LENGTH : 0);
   ptr->read_buffer_length= 0;
   ptr->read_ptr= ptr->read_buffer;
+  ptr->options.is_shutting_down= false;
   memcached_server_response_reset(ptr);
 
-  if(io_death)
+  if (io_death)
   {
     ptr->server_failure_counter++;
   }
@@ -69,15 +72,19 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
 
 void memcached_quit(memcached_st *ptr)
 {
-  unsigned int x;
+  uint32_t x;
 
-  if (ptr->hosts == NULL ||
-      memcached_server_count(ptr) == 0)
+  if (memcached_server_count(ptr) == 0)
     return;
 
-  if (ptr->hosts && memcached_server_count(ptr))
+  if (memcached_server_count(ptr))
   {
     for (x= 0; x < memcached_server_count(ptr); x++)
-      memcached_quit_server(&ptr->hosts[x], 0);
+    {
+      memcached_server_write_instance_st instance=
+        memcached_server_instance_fetch(ptr, x);
+
+      memcached_quit_server(instance, false);
+    }
   }
 }