gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failure to replicate with non-pro server when license key is set

Browse Source 
Former-commit-id: a69beef7d92223c8dcebb9c39ca2409183571e57
This commit is contained in:
John Sully 2020-07-11 22:09:27 +00:00
parent daf3883481
commit f771c0a7c8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/replication.cpp
View File

@ -2720,10 +2720,18 @@ void syncWithMaster(connection *conn) {
{ {
err = sendSynchronousCommand(mi, SYNC_CMD_READ,conn,NULL); err = sendSynchronousCommand(mi, SYNC_CMD_READ,conn,NULL);
if (err[0] == '-') { if (err[0] == '-') {
if (err[1] == 'E' && err[2] == 'R' && err[3] == 'R') {
// Replicating with non-pro
serverLog(LL_WARNING, "Replicating with non-pro server.");
mi->repl_state = REPL_STATE_SEND_PORT;
sdsfree(err);
return;
} else {
serverLog(LL_WARNING, "Recieved error from client: %s", err); serverLog(LL_WARNING, "Recieved error from client: %s", err);
sdsfree(err); sdsfree(err);
goto error; goto error;
} }
}
sdsfree(err); sdsfree(err);
mi->repl_state = REPL_STATE_SEND_PORT; mi->repl_state = REPL_STATE_SEND_PORT;
// fallthrough // fallthrough