diff --git a/src/im/message_engine.cpp b/src/im/message_engine.cpp index bc45a33dece6c4081aff2f302bbc1d442f20f992..bf62c0079d4181f1aeb830ace67edc37455cbc14 100644 --- a/src/im/message_engine.cpp +++ b/src/im/message_engine.cpp @@ -115,7 +115,7 @@ MessageEngine::retrySend() } // avoid locking while calling callback for (auto& p : pending) { - RING_DBG("[message %" PRIx64 "] retrying sending", p.token); + RING_DBG() << "[message " << p.token << "] Retry sending"; emitSignal<DRing::ConfigurationSignal::AccountMessageStatusChanged>( account_.getAccountID(), p.token, @@ -136,14 +136,14 @@ MessageEngine::getStatus(MessageToken t) const void MessageEngine::onMessageSent(MessageToken token, bool ok) { - RING_DBG("[message %" PRIx64 "] message sent: %s", token, ok ? "success" : "failure"); + RING_DBG() << "[message " << token << "] Message sent: " << (ok ? "success" : "failure"); std::lock_guard<std::mutex> lock(messagesMutex_); auto f = messages_.find(token); if (f != messages_.end()) { if (f->second.status == MessageStatus::SENDING) { if (ok) { f->second.status = MessageStatus::SENT; - RING_DBG("[message %" PRIx64 "] status changed to SENT", token); + RING_DBG() << "[message " << token << "] Status changed to SENT"; emitSignal<DRing::ConfigurationSignal::AccountMessageStatusChanged>(account_.getAccountID(), token, f->second.to, @@ -151,7 +151,7 @@ MessageEngine::onMessageSent(MessageToken token, bool ok) save_(); } else if (f->second.retried >= MAX_RETRIES) { f->second.status = MessageStatus::FAILURE; - RING_WARN("[message %" PRIx64 "] status changed to FAILURE", token); + RING_DBG() << "[message " << token << "] Status changed to FAILURE"; emitSignal<DRing::ConfigurationSignal::AccountMessageStatusChanged>(account_.getAccountID(), token, f->second.to, @@ -159,16 +159,14 @@ MessageEngine::onMessageSent(MessageToken token, bool ok) save_(); } else { f->second.status = MessageStatus::IDLE; - RING_DBG("[message %" PRIx64 "] status changed to IDLE", token); + RING_DBG() << "[message " << token << "] Status changed to IDLE"; reschedule(); } + } else { + RING_DBG() << "[message " << token << "] State is not SENDING"; } - else { - RING_DBG("[message %" PRIx64 "] state is not SENDING", token); - } - } - else { - RING_DBG("[message %" PRIx64 "] can't find message", token); + } else { + RING_DBG() << "[message " << token << "] Can't find message"; } } diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp index fc5726f9bffd6fa754f4cec1389b5dc49f1a4e39..fb6f168c7d427e54d83dbe7649c23e4be64afffc 100644 --- a/src/ringdht/ringaccount.cpp +++ b/src/ringdht/ringaccount.cpp @@ -2277,7 +2277,7 @@ RingAccount::doRegister_() std::map<std::string, std::string> payloads = {{datatype, utf8_make_valid(v.msg)}}; shared->onTextMessage(peer_account.toString(), payloads); - RING_DBG("Sending message confirmation %" PRIx64, v.id); + RING_DBG() << "Sending message confirmation " << v.id; shared->dht_.putEncrypted(inboxDeviceKey, v.from, dht::ImMessage(v.id, std::string(), now)); @@ -3345,11 +3345,11 @@ RingAccount::sendTextMessage(const std::string& to, const std::map<std::string, return true; auto e = this_.sentMessages_.find(msg.id); if (e == this_.sentMessages_.end() or e->second.to != msg.from) { - RING_DBG("[Account %s] [message %" PRIx64 "] message not found", this_.getAccountID().c_str(), token); + RING_DBG() << "[Account " << this_.getAccountID() << "] [message " << token << "] Message not found"; return true; } this_.sentMessages_.erase(e); - RING_DBG("[Account %s] [message %" PRIx64 "] received text message reply", this_.getAccountID().c_str(), token); + RING_DBG() << "[Account " << this_.getAccountID() << "] [message " << token << "] Received text message reply"; // add treated message auto res = this_.treatedMessages_.insert(msg.id); @@ -3372,7 +3372,7 @@ RingAccount::sendTextMessage(const std::string& to, const std::map<std::string, dht::ImMessage(token, std::string(payloads.begin()->first), std::string(payloads.begin()->second), now), [wshared,token,confirm,h](bool ok) { if (auto this_ = wshared.lock()) { - RING_DBG("[Account %s] [message %" PRIx64 "] put encrypted %s", this_->getAccountID().c_str(), token, ok ? "ok" : "failed"); + RING_DBG() << "[Account " << this_->getAccountID() << "] [message " << token << "] Put encrypted " << (ok ? "ok" : "failed"); if (not ok) { auto lt = confirm->listenTokens.find(h); if (lt != confirm->listenTokens.end()) { @@ -3385,7 +3385,7 @@ RingAccount::sendTextMessage(const std::string& to, const std::map<std::string, } }); - RING_DBG("[Account %s] [message %" PRIx64 "] sending message for device %s", shared->getAccountID().c_str(), token, dev.toString().c_str()); + RING_DBG() << "[Account " << shared->getAccountID() << "] [message " << token << "] Sending message for device " << dev.toString(); }, [token](const std::shared_ptr<RingAccount>& shared, bool ok) { if (not ok) { shared->messageEngine_.onMessageSent(token, false); @@ -3397,7 +3397,7 @@ RingAccount::sendTextMessage(const std::string& to, const std::map<std::string, Manager::instance().scheduleTask([wshared, confirm, token]() { if (not confirm->replied) { if (auto this_ = wshared.lock()) { - RING_DBG("[Account %s] [message %" PRIx64 "] timeout", this_->getAccountID().c_str(), token); + RING_DBG() << "[Account " << this_->getAccountID() << "] [message " << token << "] Timeout"; for (auto& t : confirm->listenTokens) this_->dht_.cancelListen(t.first, t.second.get()); confirm->listenTokens.clear();