Skip to content
Snippets Groups Projects
Commit 06803cb1 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

conversation: add more logs in case of download failure

GitLab: #972
Change-Id: I99b96231864878d4e2a17c8923d7578d9709b4c9
parent 1feb6873
Branches
No related tags found
No related merge requests found
...@@ -1976,8 +1976,10 @@ Conversation::onFileChannelRequest(const std::string& member, ...@@ -1976,8 +1976,10 @@ Conversation::onFileChannelRequest(const std::string& member,
auto commit = getCommit(interactionId); auto commit = getCommit(interactionId);
if (commit == std::nullopt || commit->find("type") == commit->end() if (commit == std::nullopt || commit->find("type") == commit->end()
|| commit->find("tid") == commit->end() || commit->find("sha3sum") == commit->end() || commit->find("tid") == commit->end() || commit->find("sha3sum") == commit->end()
|| commit->at("type") != "application/data-transfer+json") || commit->at("type") != "application/data-transfer+json") {
JAMI_WARNING("[Account {:s}] {} requested invalid file transfer commit {}", pimpl_->accountId_, member, interactionId);
return false; return false;
}
auto path = dataTransfer()->path(fileId); auto path = dataTransfer()->path(fileId);
...@@ -1986,7 +1988,7 @@ Conversation::onFileChannelRequest(const std::string& member, ...@@ -1986,7 +1988,7 @@ Conversation::onFileChannelRequest(const std::string& member,
if (std::filesystem::is_symlink(path)) { if (std::filesystem::is_symlink(path)) {
dhtnet::fileutils::remove(path, true); dhtnet::fileutils::remove(path, true);
} }
JAMI_DEBUG("[Account {:s}] {:s} asked for non existing file {} in {:s}", JAMI_WARNING("[Account {:s}] {:s} asked for non existing file {} in {:s}",
pimpl_->accountId_, pimpl_->accountId_,
member, member,
fileId, fileId,
...@@ -1995,8 +1997,8 @@ Conversation::onFileChannelRequest(const std::string& member, ...@@ -1995,8 +1997,8 @@ Conversation::onFileChannelRequest(const std::string& member,
} }
// Check that our file is correct before sending // Check that our file is correct before sending
if (verifyShaSum && commit->at("sha3sum") != fileutils::sha3File(path)) { if (verifyShaSum && commit->at("sha3sum") != fileutils::sha3File(path)) {
JAMI_DEBUG( JAMI_WARNING(
"[Account {:s}] {:s} asked for file {:s} in {:s}, but our version is not complete", "[Account {:s}] {:s} asked for file {:s} in {:s}, but our version is not complete or corrupted",
pimpl_->accountId_, pimpl_->accountId_,
member, member,
fileId, fileId,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment