From a9552f9635216699d7f64aed8c969a9f93d4e500 Mon Sep 17 00:00:00 2001 From: christianEQ Date: Thu, 20 May 2021 19:09:02 +0000 Subject: [PATCH 1/2] license status OK if not checking license Former-commit-id: 6bfdc9d41dc638989d50f005af8d66e4ed47ce77 --- src/server.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server.cpp b/src/server.cpp index bc268b4fd..cbb7654e1 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -5474,7 +5474,11 @@ 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 ); } From 982067b16a3162d2c26dcd11a4d5db662dacaf47 Mon Sep 17 00:00:00 2001 From: christianEQ Date: Wed, 2 Jun 2021 15:02:27 +0000 Subject: [PATCH 2/2] fixed code style for ifdef Former-commit-id: 93c41fa31c91098af98d2bc0362eb29685cd6678 --- src/server.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index cbb7654e1..1424ffbd1 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -5474,11 +5474,11 @@ sds genRedisInfoString(const char *section) { "variant:enterprise\r\n" "license_status:%s\r\n" "mvcc_depth:%d\r\n", - #ifdef NO_LICENSE_CHECK +#ifdef NO_LICENSE_CHECK "OK", - #else +#else cserver.license_key ? "OK" : "Trial", - #endif +#endif mvcc_depth ); }