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

Removed KeyDB Enterprise Trial

Browse Source 
Former-commit-id: 0899ede8db54db80a2cc101412e5dbcaedb706b1
This commit is contained in:
VivekSainiEQ 2021-11-15 20:33:54 +00:00
parent 96b3321059
commit 20cd658776
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/server.cpp
View File

@ -6427,13 +6427,6 @@ void redisAsciiArt(void) {
serverLogRaw(LL_NOTICE|LL_RAW,buf); serverLogRaw(LL_NOTICE|LL_RAW,buf);
} }
if (cserver.license_key == nullptr && !g_pserver->sentinel_mode)
{
#ifndef NO_LICENSE_CHECK
serverLog(LL_WARNING, "!!!! KeyDB Enterprise is being run in trial mode !!!!");
serverLog(LL_WARNING, "!!!! Execution will terminate in %d minutes !!!!", cserver.trial_timeout);
#endif
}
zfree(buf); zfree(buf);
} }
@ -7321,6 +7314,13 @@ int main(int argc, char **argv) {
serverLog(LL_WARNING, "Configuration loaded"); serverLog(LL_WARNING, "Configuration loaded");
} }
#ifndef NO_LICENSE_CHECK
if (!g_pserver->sentinel_mode && (cserver.license_key == nullptr || !FValidKey(cserver.license_key, strlen(cserver.license_key)))){
serverLog(LL_WARNING, "Error: %s license key provided, exiting immediately.", cserver.license_key == nullptr ? "No" : "Invalid");
exit(1);
}
#endif
validateConfiguration(); validateConfiguration();
const char *err; const char *err;

2
src/server.h
View File

@ -2115,7 +2115,7 @@ struct redisServerConst {
int enable_motd; /* Flag to retrieve the Message of today using CURL request*/ int enable_motd; /* Flag to retrieve the Message of today using CURL request*/
sds license_key = nullptr; sds license_key = nullptr;
int trial_timeout = 120; int trial_timeout = 0;
int delete_on_evict = false; // Only valid when a storage provider is set int delete_on_evict = false; // Only valid when a storage provider is set
int thread_min_client_threshold = 50; int thread_min_client_threshold = 50;
int multimaster_no_forward; int multimaster_no_forward;