From 9319f7aeca5d726d07e3e967d2f2f7b9d7126a46 Mon Sep 17 00:00:00 2001 From: Shivshankar Date: Tue, 4 Jun 2024 14:46:59 -0400 Subject: [PATCH] Replace valkey in log and panic messages (#550) Part of #207 --------- Signed-off-by: Shivshankar-Reddy --- src/cluster_legacy.c | 2 +- src/rdb.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cluster_legacy.c b/src/cluster_legacy.c index ee328e558e..90f31e3cd5 100644 --- a/src/cluster_legacy.c +++ b/src/cluster_legacy.c @@ -543,7 +543,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_TITLE); } if (p) s = p + 1; } diff --git a/src/rdb.c b/src/rdb.c index fe297cb7a9..6384021350 100644 --- a/src/rdb.c +++ b/src/rdb.c @@ -3021,10 +3021,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_TITLE, server.dbnum); exit(1); } db = rdb_loading_ctx->dbarray + dbid;