fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-05-18 21:21:20 +00:00
Code Issues Projects Releases Wiki Activity

Fixed issues introduced during last merge.

Browse Source
This commit is contained in:
antirez 2015-08-06 17:33:04 +02:00
parent 4363fa1d76
commit c5a8c8e907
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/replication.c
View File

@ -492,7 +492,7 @@ int startBgsaveForReplication(int mincapa) {
int retval; int retval;
int socket_target = server.repl_diskless_sync && (mincapa & SLAVE_CAPA_EOF); int socket_target = server.repl_diskless_sync && (mincapa & SLAVE_CAPA_EOF);
redisLog(REIDS_NOTICE,"Starting BGSAVE for SYNC with target: %s", redisLog(REDIS_NOTICE,"Starting BGSAVE for SYNC with target: %s",
socket_target ? "slaves sockets" : "disk"); socket_target ? "slaves sockets" : "disk");
if (socket_target) if (socket_target)
@ -619,7 +619,7 @@ void syncCommand(redisClient *c) {
/* Target is disk (or the slave is not capable of supporting /* Target is disk (or the slave is not capable of supporting
* diskless replication) and we don't have a BGSAVE in progress, * diskless replication) and we don't have a BGSAVE in progress,
* let's start one. */ * let's start one. */
if (startBgsaveForReplication(c->slave_capa) != C_OK) { if (startBgsaveForReplication(c->slave_capa) != REDIS_OK) {
redisLog(REDIS_NOTICE,"Replication failed, can't BGSAVE"); redisLog(REDIS_NOTICE,"Replication failed, can't BGSAVE");
addReplyError(c,"Unable to perform background save"); addReplyError(c,"Unable to perform background save");
return; return;