Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace valkey in log and panic messages #550

Merged
merged 6 commits into from
Jun 4, 2024
Merged

Replace valkey in log and panic messages #550

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
58af6dd
Update valkey in log and panic message
Shivshankar-Reddy May 24, 2024
01b24f2
correct log
Shivshankar-Reddy May 24, 2024
d6e1998
Update macro instead of config
Shivshankar-Reddy May 31, 2024
da5ab34
update code format
Shivshankar-Reddy May 31, 2024
f750aca
update macro instead of config
Shivshankar-Reddy Jun 3, 2024
b25e315
correct format
Shivshankar-Reddy Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cluster_legacy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ int clusterLoadConfig(char *filename) {
} else if (!strcasecmp(s, "noflags")) {
/* nothing to do */
} else {
serverPanic("Unknown flag in redis cluster config file");
serverPanic("Unknown flag in %s cluster config file", SERVER_NAME);
Shivshankar-Reddy marked this conversation as resolved.
Show resolved Hide resolved
}
if (p) s = p + 1;
}
Expand Down
7 changes: 3 additions & 4 deletions src/rdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3020,10 +3020,9 @@ int rdbLoadRioWithLoadingCtx(rio *rdb, int rdbflags, rdbSaveInfo *rsi, rdbLoadin
if ((dbid = rdbLoadLen(rdb, NULL)) == RDB_LENERR) goto eoferr;
if (dbid >= (unsigned)server.dbnum) {
serverLog(LL_WARNING,
"FATAL: Data file was created with a Redis "
"server configured to handle more than %d "
"databases. Exiting\n",
server.dbnum);
"FATAL: Data file was created with a %s server configured to "
"handle more than %d databases. Exiting\n",
server.extended_redis_compat ? "Redis" : "Valkey", server.dbnum);
Shivshankar-Reddy marked this conversation as resolved.
Show resolved Hide resolved
exit(1);
}
db = rdb_loading_ctx->dbarray + dbid;
Expand Down
Loading