From b0c0cd8f8df897b2eef28a74f9c8a9d709e9febf Mon Sep 17 00:00:00 2001
From: VivekSainiEQ <vivek@eqalpha.com>
Date: Mon, 15 Nov 2021 23:56:30 +0000
Subject: [PATCH] Removed trial code entirely

Former-commit-id: 540a60eb12d01c2839228f9fdaa6233aed99dc38
---
 src/server.cpp | 29 -----------------------------
 src/server.h   |  1 -
 2 files changed, 30 deletions(-)

diff --git a/src/server.cpp b/src/server.cpp
index b648c3d6f..7db57090a 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1258,29 +1258,6 @@ void _serverLog(int level, const char *fmt, ...) {
     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
  * 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) {
-        checkTrialTimeout();
-
         /* Tune the fastlock to CPU load */
         fastlock_auto_adjust_waits();
     }
@@ -6128,11 +6103,7 @@ sds genRedisInfoString(const char *section) {
             "variant:enterprise\r\n"
             "license_status:%s\r\n"
             "mvcc_depth:%d\r\n",
-#ifdef NO_LICENSE_CHECK
             "OK",
-#else
-            cserver.license_key ? "OK" : "Trial",
-#endif
             mvcc_depth
         );
     }
diff --git a/src/server.h b/src/server.h
index 6a318fcd6..cf565f89b 100644
--- a/src/server.h
+++ b/src/server.h
@@ -2115,7 +2115,6 @@ struct redisServerConst {
     int enable_motd;            /* Flag to retrieve the Message of today using CURL request*/
 
     sds license_key = nullptr;
-    int trial_timeout = 0;
     int delete_on_evict = false;   // Only valid when a storage provider is set
     int thread_min_client_threshold = 50;
     int multimaster_no_forward;