d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve logging a bit

Browse source
This commit is contained in:
Konstantinos Sideris 2018-06-18 12:29:24 +03:00
parent 8704265978
commit 4514d13948
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Olm.cpp
View file

@ -82,7 +82,8 @@ handle_pre_key_olm_message(const std::string &sender,
OlmSessionPtr inbound_session = nullptr; OlmSessionPtr inbound_session = nullptr;
try { try {
inbound_session = olm::client()->create_inbound_session(content.body); inbound_session =
olm::client()->create_inbound_session_from(sender_key, content.body);
// We also remove the one time key used to establish that // We also remove the one time key used to establish that
// session so we'll have to update our copy of the account object. // session so we'll have to update our copy of the account object.
@ -154,6 +155,9 @@ try_olm_decryption(const std::string &sender_key, const OlmCipherContent &msg)
{ {
auto session_ids = cache::client()->getOlmSessions(sender_key); auto session_ids = cache::client()->getOlmSessions(sender_key);
nhlog::crypto()->info("attempt to decrypt message with {} known session_ids",
session_ids.size());
for (const auto &id : session_ids) { for (const auto &id : session_ids) {
auto session = cache::client()->getOlmSession(sender_key, id); auto session = cache::client()->getOlmSession(sender_key, id);

5
src/timeline/TimelineView.cc
View file

@ -331,7 +331,8 @@ TimelineView::parseEncryptedEvent(const mtx::events::EncryptedEvent<mtx::events:
body["origin_server_ts"] = e.origin_server_ts; body["origin_server_ts"] = e.origin_server_ts;
body["unsigned"] = e.unsigned_data; body["unsigned"] = e.unsigned_data;
nhlog::crypto()->info("decrypted data: \n {}", body.dump(2)); nhlog::crypto()->info("decrypted event: {}", e.event_id);
nhlog::crypto()->debug("decrypted data: \n {}", body.dump(2));
json event_array = json::array(); json event_array = json::array();
event_array.push_back(body); event_array.push_back(body);
@ -673,8 +674,8 @@ TimelineView::sendNextPendingMessage()
nhlog::ui()->info("[{}] sending next queued message", m.txn_id); nhlog::ui()->info("[{}] sending next queued message", m.txn_id);
if (m.is_encrypted) { if (m.is_encrypted) {
prepareEncryptedMessage(std::move(m));
nhlog::ui()->info("[{}] sending encrypted event", m.txn_id); nhlog::ui()->info("[{}] sending encrypted event", m.txn_id);
prepareEncryptedMessage(std::move(m));
return; return;
} }