tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Warn on DcId change only for server locations.

Browse Source 
GitOrigin-RevId: 04f11a63d84882f7c1ccd15a79845b7482c6a451
This commit is contained in:
levlam 2020-03-31 02:16:23 +03:00
parent 409fd70c15
commit 29c81b4252
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/files/FileManager.cpp
View File

@ -1394,9 +1394,11 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
if (x_node->remote_.full && y_node->remote_.full && !x_node->remote_.full.value().is_web() && if (x_node->remote_.full && y_node->remote_.full && !x_node->remote_.full.value().is_web() &&
!y_node->remote_.full.value().is_web() && y_node->remote_.is_full_alive && !y_node->remote_.full.value().is_web() && y_node->remote_.is_full_alive &&
x_node->remote_.full_source == FileLocationSource::FromServer &&
y_node->remote_.full_source == FileLocationSource::FromServer &&
x_node->remote_.full.value().get_dc_id() != y_node->remote_.full.value().get_dc_id()) { x_node->remote_.full.value().get_dc_id() != y_node->remote_.full.value().get_dc_id()) {
LOG(WARNING) << "File remote location was changed from " << y_node->remote_.full.value() << " to " LOG(ERROR) << "File remote location was changed from " << y_node->remote_.full.value() << " to "
<< x_node->remote_.full.value(); << x_node->remote_.full.value();
} }
auto count_local = [](auto &node) { auto count_local = [](auto &node) {
return std::accumulate(node->file_ids_.begin(), node->file_ids_.end(), 0, return std::accumulate(node->file_ids_.begin(), node->file_ids_.end(), 0,