projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
m4: lost cinttypes
[awesomized/libmemcached]
/
libmemcached
/
behavior.cc
diff --git
a/libmemcached/behavior.cc
b/libmemcached/behavior.cc
index 2675e23602db163dad9e00ca5e171025739fd606..f5e1f0ac4691957df388e4d70d0814d029fbfff4 100644
(file)
--- a/
libmemcached/behavior.cc
+++ b/
libmemcached/behavior.cc
@@
-106,6
+106,7
@@
memcached_return_t memcached_behavior_set(memcached_st *shell,
case MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS:
ptr->flags.auto_eject_hosts= bool(data);
case MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS:
ptr->flags.auto_eject_hosts= bool(data);
+ /* fall through */
case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
if (data == 0)
case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
if (data == 0)
@@
-116,6
+117,10
@@
memcached_return_t memcached_behavior_set(memcached_st *shell,
ptr->server_failure_limit= uint32_t(data);
break;
ptr->server_failure_limit= uint32_t(data);
break;
+ case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT:
+ ptr->server_timeout_limit= uint32_t(data);
+ break;
+
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
send_quit(ptr); // We need t shutdown all of the connections to make sure we do the correct protocol
if (data)
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
send_quit(ptr); // We need t shutdown all of the connections to make sure we do the correct protocol
if (data)
@@
-230,11
+235,6
@@
memcached_return_t memcached_behavior_set(memcached_st *shell,
break;
case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT:
break;
case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT:
- if (data == 0)
- {
- return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
- memcached_literal_param("MEMCACHED_BEHAVIOR_RETRY_TIMEOUT requires a value greater then zero."));
- }
ptr->retry_timeout= int32_t(data);
break;
ptr->retry_timeout= int32_t(data);
break;
@@
-379,6
+379,9
@@
uint64_t memcached_behavior_get(memcached_st *shell,
case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
return ptr->server_failure_limit;
case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
return ptr->server_failure_limit;
+ case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT:
+ return ptr->server_timeout_limit;
+
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
return ptr->flags.use_sort_hosts;
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
return ptr->flags.use_sort_hosts;
@@
-628,6
+631,7
@@
const char *libmemcached_string_behavior(const memcached_behavior_t flag)
{
switch (flag)
{
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT: return "MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT";
case MEMCACHED_BEHAVIOR_NO_BLOCK: return "MEMCACHED_BEHAVIOR_NO_BLOCK";
case MEMCACHED_BEHAVIOR_TCP_NODELAY: return "MEMCACHED_BEHAVIOR_TCP_NODELAY";
case MEMCACHED_BEHAVIOR_HASH: return "MEMCACHED_BEHAVIOR_HASH";
case MEMCACHED_BEHAVIOR_NO_BLOCK: return "MEMCACHED_BEHAVIOR_NO_BLOCK";
case MEMCACHED_BEHAVIOR_TCP_NODELAY: return "MEMCACHED_BEHAVIOR_TCP_NODELAY";
case MEMCACHED_BEHAVIOR_HASH: return "MEMCACHED_BEHAVIOR_HASH";