From 473cc0543860c805a0142bd67ad98050d88131c1 Mon Sep 17 00:00:00 2001 From: JJ Date: Sun, 18 May 2025 10:22:19 -0400 Subject: [PATCH] Add custom database version output to CLI from #4892 --- world/cli/database_version.cpp | 1 + world/cli/version.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/world/cli/database_version.cpp b/world/cli/database_version.cpp index e3130b9dc..45ab111e0 100644 --- a/world/cli/database_version.cpp +++ b/world/cli/database_version.cpp @@ -14,6 +14,7 @@ void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, s v["database_version"] = CURRENT_BINARY_DATABASE_VERSION; v["bots_database_version"] = RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0; + v["custom_database_version"] = CUSTOM_BINARY_DATABASE_VERSION; std::stringstream payload; payload << v; diff --git a/world/cli/version.cpp b/world/cli/version.cpp index d03fd5e26..383b69ac7 100644 --- a/world/cli/version.cpp +++ b/world/cli/version.cpp @@ -11,11 +11,12 @@ void WorldserverCLI::Version(int argc, char **argv, argh::parser &cmd, std::stri Json::Value j; - j["bots_database_version"] = CURRENT_BINARY_BOTS_DATABASE_VERSION; - j["compile_date"] = COMPILE_DATE; - j["compile_time"] = COMPILE_TIME; - j["database_version"] = CURRENT_BINARY_DATABASE_VERSION; - j["server_version"] = CURRENT_VERSION; + j["bots_database_version"] = CURRENT_BINARY_BOTS_DATABASE_VERSION; + j["compile_date"] = COMPILE_DATE; + j["compile_time"] = COMPILE_TIME; + j["custom_database_version"] = CUSTOM_BINARY_DATABASE_VERSION; + j["database_version"] = CURRENT_BINARY_DATABASE_VERSION; + j["server_version"] = CURRENT_VERSION; std::stringstream payload; payload << j;