From 64cfb6df6215c18eeff080e3ace0537148de00a7 Mon Sep 17 00:00:00 2001 From: John Sully Date: Sat, 11 Jul 2020 22:13:07 +0000 Subject: [PATCH] Sentinel doesn't need a license key Former-commit-id: bc2d8c18255214b873bf45d8db8af3727ebc4723 --- src/server.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server.cpp b/src/server.cpp index 4a1b1ff72..e3704870d 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1126,6 +1126,8 @@ void serverLog(int level, const char *fmt, ...) { static void checkTrialTimeout() { #ifndef NO_LICENSE_CHECK + if (g_pserver->sentinel_mode) + return; // sentinel is not licensed if (cserver.license_key != nullptr && FValidKey(cserver.license_key, strlen(cserver.license_key))) return; time_t curtime = time(NULL); @@ -5251,7 +5253,7 @@ void redisAsciiArt(void) { serverLogRaw(LL_NOTICE|LL_RAW,buf); } - if (cserver.license_key == nullptr) + if (cserver.license_key == nullptr && !g_pserver->sentinel_mode) { #ifndef NO_LICENSE_CHECK serverLog(LL_WARNING, "!!!! KeyDB Pro is being run in trial mode !!!!");