andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Improve logging on failed CHECK.

Browse Source 
GitOrigin-RevId: 34a9fdad6499503edca51c4c3136731d2c8acb8a
This commit is contained in:
levlam 2019-10-03 23:23:38 +03:00
parent ef924d218d
commit dcfa6d1ea6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
td/telegram/MessagesManager.cpp
View File

@ -9005,7 +9005,12 @@ void MessagesManager::ttl_unregister_message(DialogId dialog_id, const Message *
TtlNode ttl_node(dialog_id, m->message_id); TtlNode ttl_node(dialog_id, m->message_id);
auto it = ttl_nodes_.find(ttl_node); auto it = ttl_nodes_.find(ttl_node);
LOG_CHECK(it != ttl_nodes_.end()) << dialog_id << " " << m->message_id << " " << source << " " << G()->close_flag();
// expect m->ttl == 0, but m->ttl_expires_at > 0 from binlog
LOG_CHECK(it != ttl_nodes_.end()) << dialog_id << " " << m->message_id << " " << source << " " << G()->close_flag()
<< " " << m->ttl << " " << m->ttl_expires_at << " " << Time::now() << " "
<< m->from_database;
auto *heap_node = it->as_heap_node(); auto *heap_node = it->as_heap_node();
if (heap_node->in_heap()) { if (heap_node->in_heap()) {
ttl_heap_.erase(heap_node); ttl_heap_.erase(heap_node);
@ -11484,12 +11489,12 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
update_message_count_by_index(d, -1, result.get()); update_message_count_by_index(d, -1, result.get());
} }
on_message_deleted(d, result.get()); on_message_deleted(d, result.get(), source);
return result; return result;
} }
void MessagesManager::on_message_deleted(Dialog *d, Message *m) { void MessagesManager::on_message_deleted(Dialog *d, Message *m, const char *source) {
switch (d->dialog_id.get_type()) { switch (d->dialog_id.get_type()) {
case DialogType::User: case DialogType::User:
case DialogType::Chat: case DialogType::Chat:
@ -11505,7 +11510,7 @@ void MessagesManager::on_message_deleted(Dialog *d, Message *m) {
default: default:
UNREACHABLE(); UNREACHABLE();
} }
ttl_unregister_message(d->dialog_id, m, Time::now(), "on_message_deleted"); ttl_unregister_message(d->dialog_id, m, Time::now(), source);
unregister_message_content(td_, m->content.get(), {d->dialog_id, m->message_id}); unregister_message_content(td_, m->content.get(), {d->dialog_id, m->message_id});
if (m->notification_id.is_valid()) { if (m->notification_id.is_valid()) {
delete_notification_id_to_message_id_correspondence(d, m->notification_id, m->message_id); delete_notification_id_to_message_id_correspondence(d, m->notification_id, m->message_id);
@ -11539,7 +11544,7 @@ void MessagesManager::do_delete_all_dialog_messages(Dialog *d, unique_ptr<Messag
cancel_edit_message_media(d->dialog_id, m.get(), "Message was deleted"); cancel_edit_message_media(d->dialog_id, m.get(), "Message was deleted");
} }
on_message_deleted(d, m.get()); on_message_deleted(d, m.get(), "do_delete_all_dialog_messages");
m = nullptr; m = nullptr;
} }

2
td/telegram/MessagesManager.h
View File

@ -1475,7 +1475,7 @@ class MessagesManager : public Actor {
unique_ptr<Message> do_delete_message(Dialog *d, MessageId message_id, bool is_permanently_deleted, unique_ptr<Message> do_delete_message(Dialog *d, MessageId message_id, bool is_permanently_deleted,
bool only_from_memory, bool *need_update_dialog_pos, const char *source); bool only_from_memory, bool *need_update_dialog_pos, const char *source);
void on_message_deleted(Dialog *d, Message *m); void on_message_deleted(Dialog *d, Message *m, const char *source);
int32 get_unload_dialog_delay() const; int32 get_unload_dialog_delay() const;