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

Replace valkey in log and panic messages (#550)

Browse Source 
Part of #207

---------

Signed-off-by: Shivshankar-Reddy <shiva.sheri.github@gmail.com>
This commit is contained in:
Shivshankar 2024-06-04 14:46:59 -04:00 committed by GitHub
parent 0700c441c6
commit 9319f7aeca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cluster_legacy.c
View File

@ -543,7 +543,7 @@ int clusterLoadConfig(char *filename) {
} else if (!strcasecmp(s, "noflags")) { } else if (!strcasecmp(s, "noflags")) {
/* nothing to do */ /* nothing to do */
} else { } else {
serverPanic("Unknown flag in redis cluster config file"); serverPanic("Unknown flag in %s cluster config file", SERVER_TITLE);
} }
if (p) s = p + 1; if (p) s = p + 1;
} }

7
src/rdb.c
View File

@ -3021,10 +3021,9 @@ int rdbLoadRioWithLoadingCtx(rio *rdb, int rdbflags, rdbSaveInfo *rsi, rdbLoadin
if ((dbid = rdbLoadLen(rdb, NULL)) == RDB_LENERR) goto eoferr; if ((dbid = rdbLoadLen(rdb, NULL)) == RDB_LENERR) goto eoferr;
if (dbid >= (unsigned)server.dbnum) { if (dbid >= (unsigned)server.dbnum) {
serverLog(LL_WARNING, serverLog(LL_WARNING,
"FATAL: Data file was created with a Redis " "FATAL: Data file was created with a %s server configured to handle "
"server configured to handle more than %d " "more than %d databases. Exiting\n",
"databases. Exiting\n", SERVER_TITLE, server.dbnum);
server.dbnum);
exit(1); exit(1);
} }
db = rdb_loading_ctx->dbarray + dbid; db = rdb_loading_ctx->dbarray + dbid;