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

Removed trial code entirely

Browse Source 
Former-commit-id: 540a60eb12d01c2839228f9fdaa6233aed99dc38
This commit is contained in:
VivekSainiEQ 2021-11-15 23:56:30 +00:00
parent 32336ec921
commit b0c0cd8f8d
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/server.cpp
View File

@ -1258,29 +1258,6 @@ void _serverLog(int level, const char *fmt, ...) {
serverLogRaw(level,msg); serverLogRaw(level,msg);
} }
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);
int64_t elapsed = (int64_t)curtime - (int64_t)cserver.stat_starttime;
int64_t remaining = (cserver.trial_timeout * 60L) - elapsed;
if (remaining <= 0)
{
serverLog(LL_WARNING, "Trial timeout exceeded. KeyDB will now exit.");
prepareForShutdown(SHUTDOWN_SAVE);
exit(0);
}
else
{
serverLog(LL_WARNING, "Trial timeout in %ld:%02ld minutes", remaining/60, remaining % 60);
}
#endif
}
/* Log a fixed message without printf-alike capabilities, in a way that is /* Log a fixed message without printf-alike capabilities, in a way that is
* safe to call from a signal handler. * safe to call from a signal handler.
* *
@ -2586,8 +2563,6 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
} }
run_with_period(30000) { run_with_period(30000) {
checkTrialTimeout();
/* Tune the fastlock to CPU load */ /* Tune the fastlock to CPU load */
fastlock_auto_adjust_waits(); fastlock_auto_adjust_waits();
} }
@ -6128,11 +6103,7 @@ sds genRedisInfoString(const char *section) {
"variant:enterprise\r\n" "variant:enterprise\r\n"
"license_status:%s\r\n" "license_status:%s\r\n"
"mvcc_depth:%d\r\n", "mvcc_depth:%d\r\n",
#ifdef NO_LICENSE_CHECK
"OK", "OK",
#else
cserver.license_key ? "OK" : "Trial",
#endif
mvcc_depth mvcc_depth
); );
} }

1
src/server.h
View File

@ -2115,7 +2115,6 @@ 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 = 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;