diff options
| author | antirez <antirez@gmail.com> | 2019-10-28 11:09:09 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2019-10-28 11:09:09 +0100 |
| commit | 8337e083b6e356c938891a1b63c1f9807b647f34 (patch) | |
| tree | 4a7048b7e02af8de8ac9ec410572019359277ca1 /src/server.c | |
| parent | 5dd1130272c3496232a71f954eb51845020ff271 (diff) | |
| parent | c328c807e7cef76db0fcf6fc2a58f62349489458 (diff) | |
| download | redis-8337e083b6e356c938891a1b63c1f9807b647f34.tar.gz | |
Merge branch 'unstable' of github.com:/antirez/redis into unstable
Diffstat (limited to 'src/server.c')
| -rw-r--r-- | src/server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server.c b/src/server.c index cbcbf7183..8f165113d 100644 --- a/src/server.c +++ b/src/server.c @@ -2104,7 +2104,7 @@ void beforeSleep(struct aeEventLoop *eventLoop) { /* Check if there are clients unblocked by modules that implement * blocking commands. */ - moduleHandleBlockedClients(); + if (moduleCount()) moduleHandleBlockedClients(); /* Try to process pending commands for clients that were just unblocked. */ if (listLength(server.unblocked_clients)) @@ -3208,7 +3208,7 @@ void preventCommandReplication(client *c) { * CMD_CALL_STATS Populate command stats. * CMD_CALL_PROPAGATE_AOF Append command to AOF if it modified the dataset * or if the client flags are forcing propagation. - * CMD_CALL_PROPAGATE_REPL Send command to salves if it modified the dataset + * CMD_CALL_PROPAGATE_REPL Send command to slaves if it modified the dataset * or if the client flags are forcing propagation. * CMD_CALL_PROPAGATE Alias for PROPAGATE_AOF|PROPAGATE_REPL. * CMD_CALL_FULL Alias for SLOWLOG|STATS|PROPAGATE. |