tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix canceling alarms before init.

Browse Source 
GitOrigin-RevId: 4ef53a7838c58b6bef1923f97cc0a2cc98786ef0
This commit is contained in:
levlam 2018-05-16 18:40:26 +03:00
parent 0fd4a3b780
commit 29ab63d063
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
td/telegram/Td.cpp
View File

@ -4036,7 +4036,7 @@ void Td::request(uint64 id, tl_object_ptr<td_api::Function> function) {
break; break;
} }
if (is_preauthentication_request(function_id)) { if (is_preauthentication_request(function_id)) {
// pending_preauthentication_requests_.emplace_back(id, std::move(function)); pending_preauthentication_requests_.emplace_back(id, std::move(function));
// return; // return;
} }
return send_error_raw(id, 401, "Initialization parameters are needed"); return send_error_raw(id, 401, "Initialization parameters are needed");
@ -4069,7 +4069,7 @@ void Td::request(uint64 id, tl_object_ptr<td_api::Function> function) {
break; break;
} }
if (is_preauthentication_request(function_id)) { if (is_preauthentication_request(function_id)) {
// pending_preauthentication_requests_.emplace_back(id, std::move(function)); pending_preauthentication_requests_.emplace_back(id, std::move(function));
// return; // return;
} }
return send_error_raw(id, 401, "Database encryption key is needed"); return send_error_raw(id, 401, "Database encryption key is needed");
@ -4409,6 +4409,23 @@ void Td::clear_handlers() {
result_handlers_.clear(); result_handlers_.clear();
} }
void Td::clear_requests() {
while (!pending_alarms_.empty()) {
auto it = pending_alarms_.begin();
auto alarm_id = it->first;
pending_alarms_.erase(it);
alarm_timeout_.cancel_timeout(alarm_id);
}
while (!request_set_.empty()) {
uint64 id = *request_set_.begin();
if (destroy_flag_) {
send_error_impl(id, make_error(401, "Unauthorized"));
} else {
send_error_impl(id, make_error(500, "Internal Server Error: closing"));
}
}
}
void Td::clear() { void Td::clear() {
if (close_flag_ >= 2) { if (close_flag_ >= 2) {
return; return;
@ -4433,20 +4450,7 @@ void Td::clear() {
LOG(DEBUG) << "NetQueryDispatcher was stopped " << timer; LOG(DEBUG) << "NetQueryDispatcher was stopped " << timer;
state_manager_.reset(); state_manager_.reset();
LOG(DEBUG) << "StateManager was cleared " << timer; LOG(DEBUG) << "StateManager was cleared " << timer;
while (!pending_alarms_.empty()) { clear_requests();
auto it = pending_alarms_.begin();
auto alarm_id = it->first;
pending_alarms_.erase(it);
alarm_timeout_.cancel_timeout(alarm_id);
}
while (!request_set_.empty()) {
uint64 id = *request_set_.begin();
if (destroy_flag_) {
send_error_impl(id, make_error(401, "Unauthorized"));
} else {
send_error_impl(id, make_error(500, "Internal Server Error: closing"));
}
}
if (is_online_) { if (is_online_) {
is_online_ = false; is_online_ = false;
alarm_timeout_.cancel_timeout(ONLINE_ALARM_ID); alarm_timeout_.cancel_timeout(ONLINE_ALARM_ID);
@ -4520,9 +4524,11 @@ void Td::close_impl(bool destroy_flag) {
return; return;
} }
if (state_ == State::WaitParameters) { if (state_ == State::WaitParameters) {
clear_requests();
return on_closed(); return on_closed();
} }
if (state_ == State::Decrypt) { if (state_ == State::Decrypt) {
clear_requests();
if (destroy_flag) { if (destroy_flag) {
TdDb::destroy(parameters_); TdDb::destroy(parameters_);
} }

2
td/telegram/Td.h
View File

@ -262,6 +262,8 @@ class Td final : public NetQueryCallback {
void clear_handlers(); void clear_handlers();
// void destroy_handler(ResultHandler *handler); // void destroy_handler(ResultHandler *handler);
void clear_requests();
static bool is_internal_config_option(Slice name); static bool is_internal_config_option(Slice name);
void on_config_option_updated(const string &name); void on_config_option_updated(const string &name);