diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2015-07-17 10:34:43 +0200 |
|---|---|---|
| committer | Salvatore Sanfilippo <antirez@gmail.com> | 2015-07-17 10:34:43 +0200 |
| commit | f049cfdb0dbb92d64a274ecdaefa4dcc7cfee06d (patch) | |
| tree | e5f5db9c1521525e3c7f11c0ddd23ce7f793dda5 | |
| parent | 25e1cb3f040262deb13c9be6a07e19b6cac485f0 (diff) | |
| parent | 92c146dfd3f756855a37cb50c8fe29c9fb4b12c2 (diff) | |
| download | redis-f049cfdb0dbb92d64a274ecdaefa4dcc7cfee06d.tar.gz | |
Merge pull request #2676 from july2993/unstable
config tcp-keepalive should be numerical field not bool
| -rw-r--r-- | src/config.c | 6 | ||||
| -rw-r--r-- | src/scripting.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/config.c b/src/config.c index 6d51b1b08..fd56269ef 100644 --- a/src/config.c +++ b/src/config.c @@ -875,12 +875,12 @@ void configSetCommand(redisClient *c) { "activerehashing",server.activerehashing) { } config_set_bool_field( "stop-writes-on-bgsave-error",server.stop_writes_on_bgsave_err) { - } config_set_bool_field( - "tcp-keepalive",server.tcpkeepalive) { /* Numerical fields. * config_set_numerical_field(name,var,min,max) */ } config_set_numerical_field( + "tcp-keepalive",server.tcpkeepalive,0,LLONG_MAX) { + } config_set_numerical_field( "maxmemory-samples",server.maxmemory_samples,1,LLONG_MAX) { } config_set_numerical_field( "timeout",server.maxidletime,0,LONG_MAX) { @@ -1088,9 +1088,9 @@ void configGetCommand(redisClient *c) { config_get_numerical_field("cluster-migration-barrier",server.cluster_migration_barrier); config_get_numerical_field("cluster-slave-validity-factor",server.cluster_slave_validity_factor); config_get_numerical_field("repl-diskless-sync-delay",server.repl_diskless_sync_delay); + config_get_numerical_field("tcp-keepalive",server.tcpkeepalive); /* Bool (yes/no) values */ - config_get_bool_field("tcp-keepalive",server.tcpkeepalive); config_get_bool_field("cluster-require-full-coverage", server.cluster_require_full_coverage); config_get_bool_field("no-appendfsync-on-rewrite", diff --git a/src/scripting.c b/src/scripting.c index 53c0c9ed2..2819c05fb 100644 --- a/src/scripting.c +++ b/src/scripting.c @@ -880,7 +880,7 @@ void luaSetGlobalArray(lua_State *lua, char *var, robj **elev, int elec) { } /* Define a lua function with the specified function name and body. - * The function name musts be a 2 characters long string, since all the + * The function name musts be a 42 characters long string, since all the * functions we defined in the Lua context are in the form: * * f_<hex sha1 sum> |