From f933adb0effb984054317b3d1914ab5222d3c89d Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Fri, 24 Jan 2025 19:50:00 -0500 Subject: [PATCH] Require a message on "Application::signalStop" --- src/test/jtx/impl/Env.cpp | 2 +- src/xrpld/app/main/Application.cpp | 8 ++++---- src/xrpld/app/main/Application.h | 2 +- src/xrpld/rpc/handlers/Stop.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp index 43286ab7824..6b9ba95a21a 100644 --- a/src/test/jtx/impl/Env.cpp +++ b/src/test/jtx/impl/Env.cpp @@ -100,7 +100,7 @@ Env::AppBundle::~AppBundle() if (app) { app->getJobQueue().rendezvous(); - app->signalStop(); + app->signalStop("~AppBundle"); } if (thread.joinable()) thread.join(); diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp index bcacdbc3757..8c8ec56f3f9 100644 --- a/src/xrpld/app/main/Application.cpp +++ b/src/xrpld/app/main/Application.cpp @@ -287,7 +287,7 @@ class ApplicationImp : public Application, public BasicApp config_->CONFIG_DIR), *this, logs_->journal("PerfLog"), - [this] { signalStop(); })) + [this] { signalStop("PerfLog"); })) , m_txMaster(*this) @@ -507,7 +507,7 @@ class ApplicationImp : public Application, public BasicApp void run() override; void - signalStop(std::string msg = "") override; + signalStop(std::string msg) override; bool checkSigs() const override; void @@ -979,7 +979,7 @@ class ApplicationImp : public Application, public BasicApp if (!config_->standalone() && !getRelationalDatabase().transactionDbHasSpace(*config_)) { - signalStop(); + signalStop("Out of transaction DB space"); } // VFALCO NOTE Does the order of calls matter? @@ -1195,7 +1195,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline) JLOG(m_journal.info()) << "Received signal " << signum; if (signum == SIGTERM || signum == SIGINT) - signalStop(); + signalStop("Signal: " + to_string(signum)); }); auto debug_log = config_->getDebugLogFile(); diff --git a/src/xrpld/app/main/Application.h b/src/xrpld/app/main/Application.h index 8f2dd606ded..c36e1c36bb9 100644 --- a/src/xrpld/app/main/Application.h +++ b/src/xrpld/app/main/Application.h @@ -138,7 +138,7 @@ class Application : public beast::PropertyStream::Source virtual void run() = 0; virtual void - signalStop(std::string msg = "") = 0; + signalStop(std::string msg) = 0; virtual bool checkSigs() const = 0; virtual void diff --git a/src/xrpld/rpc/handlers/Stop.cpp b/src/xrpld/rpc/handlers/Stop.cpp index ea37a1aaa1b..0159497449a 100644 --- a/src/xrpld/rpc/handlers/Stop.cpp +++ b/src/xrpld/rpc/handlers/Stop.cpp @@ -32,7 +32,7 @@ struct JsonContext; Json::Value doStop(RPC::JsonContext& context) { - context.app.signalStop(); + context.app.signalStop("RPC"); return RPC::makeObjectValue(systemName() + " server stopping"); }