Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
aeecbdfa
Commit
aeecbdfa
authored
Oct 31, 2011
by
antirez
Browse files
1fe4cd5d
parent
f15e33a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/redis.c
View file @
aeecbdfa
...
@@ -869,8 +869,8 @@ void initServerConfig() {
...
@@ -869,8 +869,8 @@ void initServerConfig() {
server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES;
server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES;
server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE;
server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE;
server.shutdown_asap = 0;
server.shutdown_asap = 0;
server
.
repl_ping_slave_period
=
REDIS_REPL_PING_SLAVE_PERIOD
;
server.repl_ping_slave_period = REDIS_REPL_PING_SLAVE_PERIOD;
server
.
repl_timeout
=
REDIS_REPL_TIMEOUT
;
server.repl_timeout = REDIS_REPL_TIMEOUT;
server.cluster_enabled = 0;
server.cluster_enabled = 0;
server.cluster.configfile = zstrdup("nodes.conf");
server.cluster.configfile = zstrdup("nodes.conf");
server.lua_time_limit = REDIS_LUA_TIME_LIMIT;
server.lua_time_limit = REDIS_LUA_TIME_LIMIT;
...
...
src/redis.h
View file @
aeecbdfa
...
@@ -594,8 +594,8 @@ struct redisServer {
...
@@ -594,8 +594,8 @@ struct redisServer {
char
*
masterauth
;
char
*
masterauth
;
char
*
masterhost
;
char
*
masterhost
;
int
masterport
;
int
masterport
;
int
repl_ping_slave_period
;
int
repl_ping_slave_period
;
int
repl_timeout
;
int
repl_timeout
;
redisClient
*
master
;
/* client that is master for this slave */
redisClient
*
master
;
/* client that is master for this slave */
int
repl_syncio_timeout
;
/* timeout for synchronous I/O calls */
int
repl_syncio_timeout
;
/* timeout for synchronous I/O calls */
int
replstate
;
/* replication status if the instance is a slave */
int
replstate
;
/* replication status if the instance is a slave */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment