diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2020-06-08 11:04:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 11:04:26 +0200 |
| commit | 8183a4ca7f23e93d001e927041f4da9794b382d8 (patch) | |
| tree | f1a55db23c944215a381f23d068a708eb8db14c2 /src | |
| parent | 265a7e7ec7d6b632a3efae3b6d1f1349ca790633 (diff) | |
| parent | 2fa077b0e93f9312590f6c7c8070eaa0db76747d (diff) | |
| download | redis-8183a4ca7f23e93d001e927041f4da9794b382d8.tar.gz | |
Merge pull request #7369 from oranagra/no_reject_watch
Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARD
Diffstat (limited to 'src')
| -rw-r--r-- | src/server.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server.c b/src/server.c index b7a6a928f..e8e711240 100644 --- a/src/server.c +++ b/src/server.c @@ -776,11 +776,11 @@ struct redisCommand redisCommandTable[] = { 0,NULL,0,0,0,0,0,0}, {"watch",watchCommand,-2, - "no-script fast @transaction", + "no-script fast ok-loading ok-stale @transaction", 0,NULL,1,-1,1,0,0,0}, {"unwatch",unwatchCommand,1, - "no-script fast @transaction", + "no-script fast ok-loading ok-stale @transaction", 0,NULL,0,0,0,0,0,0}, {"cluster",clusterCommand,-2, @@ -3627,6 +3627,8 @@ int processCommand(client *c) { c->cmd->proc != multiCommand && c->cmd->proc != execCommand && c->cmd->proc != discardCommand && + c->cmd->proc != watchCommand && + c->cmd->proc != unwatchCommand && !(c->cmd->proc == shutdownCommand && c->argc == 2 && tolower(((char*)c->argv[1]->ptr)[0]) == 'n') && |