external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

Fix validator-engine-console not stopping after error

Browse source
This commit is contained in:
SpyCheese 2022-07-14 14:02:50 +03:00 • committed by EmelyanenkoK
parent 417c3bb640
commit 9465fd866a
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
validator-engine-console/validator-engine-console-query.cpp
View file

@ -91,6 +91,7 @@ void Query::start_up() {
void Query::handle_error(td::Status error) { void Query::handle_error(td::Status error) {
td::TerminalIO::out() << "Failed " << name() << " query: " << error << "\n"; td::TerminalIO::out() << "Failed " << name() << " query: " << error << "\n";
td::actor::send_closure(console_, &ValidatorEngineConsole::got_result, false);
stop(); stop();
} }
@ -99,7 +100,7 @@ void Query::receive_wrap(td::BufferSlice R) {
if (S.is_error()) { if (S.is_error()) {
handle_error(std::move(S)); handle_error(std::move(S));
} else { } else {
td::actor::send_closure(console_, &ValidatorEngineConsole::got_result); td::actor::send_closure(console_, &ValidatorEngineConsole::got_result, true);
stop(); stop();
} }
} }

5
validator-engine-console/validator-engine-console.cpp
View file

@ -168,7 +168,10 @@ bool ValidatorEngineConsole::envelope_send_query(td::BufferSlice query, td::Prom
return true; return true;
} }
void ValidatorEngineConsole::got_result() { void ValidatorEngineConsole::got_result(bool success) {
if (!success && ex_mode_) {
std::_Exit(2);
}
running_queries_--; running_queries_--;
if (!running_queries_ && ex_queries_.size() > 0) { if (!running_queries_ && ex_queries_.size() > 0) {
auto data = std::move(ex_queries_[0]); auto data = std::move(ex_queries_[0]);

2
validator-engine-console/validator-engine-console.h
View file

@ -112,7 +112,7 @@ class ValidatorEngineConsole : public td::actor::Actor {
} }
bool envelope_send_query(td::BufferSlice query, td::Promise<td::BufferSlice> promise); bool envelope_send_query(td::BufferSlice query, td::Promise<td::BufferSlice> promise);
void got_result(); void got_result(bool success = true);
void show_help(std::string command, td::Promise<td::BufferSlice> promise); void show_help(std::string command, td::Promise<td::BufferSlice> promise);
void show_license(td::Promise<td::BufferSlice> promise); void show_license(td::Promise<td::BufferSlice> promise);