Modifying behavior to bounce connection in the case of a bad value from

[awesomized/libmemcached] / lib / memcached_quit.c

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index 64bfe27e25f60cb810acec811255876b4fb91301..366f7872cd76a229a3d547eb43e43ca683e8c691 100644 (file)
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -8,25 +8,39 @@
   The reason we send "quit" is that in case we have buffered IO, this 
   will force data to be completed.
 */
-void memcached_quit(memcached_st *ptr)
-{
-  unsigned int x;
 
-  if (ptr->hosts)
+void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
+{
+  if (ptr->fd != -1)
   {
-    for (x= 0; x < ptr->number_of_hosts; x++)
+    if (io_death == 0)
     {
-      if (ptr->hosts[x].fd != -1)
-      {
-        char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+      memcached_return rc;
+      rc= memcached_do(ptr, "quit\r\n", 6, 1);
+      WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
 
-        if (ptr->flags & MEM_NO_BLOCK)
-          memcached_io_write(ptr, x, "quit\r\n", 6, 1);
-        close(ptr->hosts[x].fd);
-        ptr->hosts[x].fd= -1;
-      }
+      memcached_io_close(ptr);
     }
+
+    ptr->fd= -1;
+    ptr->write_buffer_offset= 0;
+    ptr->read_buffer_length= 0;
+    ptr->read_ptr= ptr->read_buffer;
+    memcached_server_response_reset(ptr);
   }
+}
 
-  ptr->connected= 0;
+void memcached_quit(memcached_st *ptr)
+{
+  unsigned int x;
+
+  if (ptr->hosts == NULL || 
+      ptr->number_of_hosts == 0)
+    return;
+
+  if (ptr->hosts && ptr->number_of_hosts)
+  {
+    for (x= 0; x < ptr->number_of_hosts; x++)
+      memcached_quit_server(&ptr->hosts[x], 0);
+  }
 }