Skip to content

Commit fc0984d

Browse files
authored
Require a message on "Application::signalStop" (#5255)
This change adds a message parameter to Application::signalStop for extra context.
1 parent 8b3dcd4 commit fc0984d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/test/jtx/impl/Env.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Env::AppBundle::~AppBundle()
9696
if (app)
9797
{
9898
app->getJobQueue().rendezvous();
99-
app->signalStop();
99+
app->signalStop("~AppBundle");
100100
}
101101
if (thread.joinable())
102102
thread.join();

src/xrpld/app/main/Application.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ class ApplicationImp : public Application, public BasicApp
285285
config_->CONFIG_DIR),
286286
*this,
287287
logs_->journal("PerfLog"),
288-
[this] { signalStop(); }))
288+
[this] { signalStop("PerfLog"); }))
289289

290290
, m_txMaster(*this)
291291

@@ -505,7 +505,7 @@ class ApplicationImp : public Application, public BasicApp
505505
void
506506
run() override;
507507
void
508-
signalStop(std::string msg = "") override;
508+
signalStop(std::string msg) override;
509509
bool
510510
checkSigs() const override;
511511
void
@@ -977,7 +977,7 @@ class ApplicationImp : public Application, public BasicApp
977977
if (!config_->standalone() &&
978978
!getRelationalDatabase().transactionDbHasSpace(*config_))
979979
{
980-
signalStop();
980+
signalStop("Out of transaction DB space");
981981
}
982982

983983
// VFALCO NOTE Does the order of calls matter?
@@ -1193,7 +1193,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
11931193
JLOG(m_journal.info()) << "Received signal " << signum;
11941194

11951195
if (signum == SIGTERM || signum == SIGINT)
1196-
signalStop();
1196+
signalStop("Signal: " + to_string(signum));
11971197
});
11981198

11991199
auto debug_log = config_->getDebugLogFile();

src/xrpld/app/main/Application.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class Application : public beast::PropertyStream::Source
141141
virtual void
142142
run() = 0;
143143
virtual void
144-
signalStop(std::string msg = "") = 0;
144+
signalStop(std::string msg) = 0;
145145
virtual bool
146146
checkSigs() const = 0;
147147
virtual void

src/xrpld/rpc/handlers/Stop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct JsonContext;
3131
Json::Value
3232
doStop(RPC::JsonContext& context)
3333
{
34-
context.app.signalStop();
34+
context.app.signalStop("RPC");
3535
return RPC::makeObjectValue(systemName() + " server stopping");
3636
}
3737

0 commit comments

Comments
 (0)