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

addressing comments from merge review

Browse Source 
Former-commit-id: 955aa69ca16ca7230d5099ad16f6f825402b5dd5
This commit is contained in:
benschermel 2021-03-23 18:41:59 +00:00
parent 5c145039d4
commit efa9d4ef98
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/deb/deb-buildsource.sh
View File

@ -61,4 +61,4 @@ sudo pbuilder --build *.dsc --logfile /mnt/pbuilderlog.log
cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated
sudo pbuilder clean sudo pbuilder clean
cd ../ cd ../
#rm -rf $pkg_name rm -rf $pkg_name

2
src/config.cpp
View File

@ -1855,7 +1855,7 @@ int rewriteConfig(char *path, int force_all) {
rewriteConfigClientoutputbufferlimitOption(state); rewriteConfigClientoutputbufferlimitOption(state);
rewriteConfigYesNoOption(state,"active-replica",g_pserver->fActiveReplica,CONFIG_DEFAULT_ACTIVE_REPLICA); rewriteConfigYesNoOption(state,"active-replica",g_pserver->fActiveReplica,CONFIG_DEFAULT_ACTIVE_REPLICA);
rewriteConfigStringOption(state, "version-override",KEYDB_SET_VERSION,KEYDB_REAL_VERSION); rewriteConfigStringOption(state, "version-override",KEYDB_SET_VERSION,KEYDB_REAL_VERSION);
rewriteConfigStringOption(state, "enable-pro", cserver.license_key, CONFIG_DEFAULT_LICENSE_KEY); rewriteConfigStringOption(state, "enable-enterprise", cserver.license_key, CONFIG_DEFAULT_LICENSE_KEY);
rewriteConfigOOMScoreAdjValuesOption(state); rewriteConfigOOMScoreAdjValuesOption(state);
/* Rewrite Sentinel config if in Sentinel mode. */ /* Rewrite Sentinel config if in Sentinel mode. */

4
src/replication.cpp
View File

@ -2747,8 +2747,8 @@ void syncWithMaster(connection *conn) {
err = sendSynchronousCommand(mi, SYNC_CMD_READ,conn,NULL); err = sendSynchronousCommand(mi, SYNC_CMD_READ,conn,NULL);
if (err[0] == '-') { if (err[0] == '-') {
if (err[1] == 'E' && err[2] == 'R' && err[3] == 'R') { if (err[1] == 'E' && err[2] == 'R' && err[3] == 'R') {
// Replicating with non-pro // Replicating with non-enterprise
serverLog(LL_WARNING, "Replicating with non-pro server."); serverLog(LL_WARNING, "Replicating with non-enterprise server.");
} else { } else {
serverLog(LL_WARNING, "Recieved error from client: %s", err); serverLog(LL_WARNING, "Recieved error from client: %s", err);
sdsfree(err); sdsfree(err);

4
src/server.cpp
View File

@ -71,7 +71,7 @@
int g_fTestMode = false; int g_fTestMode = false;
const char *motd_url = "http://api.keydb.dev/motd/motd_server_pro.txt"; const char *motd_url = "http://api.keydb.dev/motd/motd_server_pro.txt";
const char *motd_cache_file = "/.keydb-pro-server-motd"; const char *motd_cache_file = "/.keydb-enterprise-server-motd";
#ifdef __linux__ #ifdef __linux__
#include <sys/mman.h> #include <sys/mman.h>
@ -5426,7 +5426,7 @@ sds genRedisInfoString(const char *section) {
if (sections++) info = sdscat(info,"\r\n"); if (sections++) info = sdscat(info,"\r\n");
info = sdscatprintf(info, info = sdscatprintf(info,
"# KeyDB\r\n" "# KeyDB\r\n"
"variant:pro\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",
cserver.license_key ? "OK" : "Trial", cserver.license_key ? "OK" : "Trial",