X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_server.c;h=2ecbe214d9fb416f60b9fca98290bb70ee37977f;hb=f6c04131cc9952372e3f63de2db4edc9f8181fb2;hp=7b9c2117bff972b893f17eca23e1d0ae05b4aaf9;hpb=15b71a80142a85eb34afbad016a23bb591145f36;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached_server.c b/libmemcached/memcached_server.c index 7b9c2117..2ecbe214 100644 --- a/libmemcached/memcached_server.c +++ b/libmemcached/memcached_server.c @@ -16,14 +16,14 @@ memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve } else memset(ptr, 0, sizeof(memcached_server_st)); - + ptr->root= memc; return ptr; } -memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host, - const char *hostname, unsigned int port, +memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host, + const char *hostname, unsigned int port, uint32_t weight, memcached_connection type) { host= memcached_server_create(memc, host); @@ -76,7 +76,7 @@ memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcache if (ptr == NULL) return NULL; - rv = memcached_server_create_with(ptr->root, clone, + rv = memcached_server_create_with(ptr->root, clone, ptr->hostname, ptr->port, ptr->weight, ptr->type); if (rv != NULL) @@ -90,7 +90,7 @@ memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcache } -memcached_return memcached_server_cursor(memcached_st *ptr, +memcached_return memcached_server_cursor(memcached_st *ptr, memcached_server_function *callback, void *context, unsigned int number_of_callbacks) @@ -119,7 +119,7 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key { uint32_t server_key; - *error= memcached_validate_key_length(key_length, + *error= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL); unlikely (*error != MEMCACHED_SUCCESS) return NULL; @@ -146,7 +146,7 @@ const char *memcached_server_error(memcached_server_st *ptr) { if (ptr) return ptr->cached_server_error; - else + else return NULL; } @@ -154,3 +154,8 @@ void memcached_server_error_reset(memcached_server_st *ptr) { ptr->cached_server_error[0]= 0; } + +memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr) +{ + return ptr->last_disconnected_server; +}