From da886281f484febe915fed56859b3e64799f2afe Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 1 Oct 2022 01:28:54 +0300
Subject: [PATCH] Improve logging.

---
 td/telegram/CallManager.cpp | 13 +++++--------
 td/telegram/Td.cpp          |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/td/telegram/CallManager.cpp b/td/telegram/CallManager.cpp
index d938548b1..fdb9fe7ce 100644
--- a/td/telegram/CallManager.cpp
+++ b/td/telegram/CallManager.cpp
@@ -174,7 +174,7 @@ ActorId<CallActor> CallManager::get_call_actor(CallId call_id) {
 void CallManager::hangup() {
   close_flag_ = true;
   for (auto &it : id_to_actor_) {
-    LOG(INFO) << "Ask close CallActor " << it.first;
+    LOG(INFO) << "Ask to close CallActor " << it.first.get();
     it.second.reset();
   }
   if (id_to_actor_.empty()) {
@@ -185,13 +185,10 @@ void CallManager::hangup() {
 void CallManager::hangup_shared() {
   auto token = narrow_cast<int32>(get_link_token());
   auto it = id_to_actor_.find(CallId(token));
-  if (it != id_to_actor_.end()) {
-    LOG(INFO) << "Close CallActor " << tag("id", it->first);
-    it->second.release();
-    id_to_actor_.erase(it);
-  } else {
-    LOG(FATAL) << "Unknown CallActor hangup " << tag("id", static_cast<int32>(token));
-  }
+  CHECK(it != id_to_actor_.end());
+  CHECK(it->second.empty());
+  LOG(INFO) << "Closed CallActor " << it->first.get();
+  id_to_actor_.erase(it);
   if (close_flag_ && id_to_actor_.empty()) {
     stop();
   }
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 95a5d02b0..e337123ff 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -4009,7 +4009,7 @@ void Td::send_error_impl(uint64 id, tl_object_ptr<td_api::error> error) {
   auto it = request_set_.find(id);
   if (it != request_set_.end()) {
     if (error->code_ == 0 && error->message_ == "Lost promise") {
-      LOG(FATAL) << "Lost promise for query " << id << " of type " << it->second;
+      LOG(FATAL) << "Lost promise for query " << id << " of type " << it->second << " in close state " << close_flag_;
     }
     VLOG(td_requests) << "Sending error for request " << id << ": " << oneline(to_string(error));
     request_set_.erase(it);