andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Fix stopping FileGC when closing.

Browse Source 
GitOrigin-RevId: c265738cf08aecf35766ad986f7e90f39c7503e3
This commit is contained in:
levlam 2019-06-05 04:53:43 +03:00
parent 1ed97b8539
commit 54296a1ed8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
td/telegram/StorageManager.cpp
View File

@ -139,13 +139,11 @@ void StorageManager::create_stats_worker() {
} }
void StorageManager::on_all_files(Result<FileStats> r_file_stats, bool dummy) { void StorageManager::on_all_files(Result<FileStats> r_file_stats, bool dummy) {
if (is_closed_ && r_file_stats.is_ok()) {
r_file_stats = Status::Error(500, "Request aborted");
}
if (r_file_stats.is_error()) { if (r_file_stats.is_error()) {
LOG(ERROR) << "Stats for GC failed: " << r_file_stats.error(); return on_gc_finished(std::move(r_file_stats), false);
auto promises = std::move(pending_run_gc_);
for (auto &promise : promises) {
promise.set_error(r_file_stats.error().clone());
}
return;
} }
create_gc_worker(); create_gc_worker();
@ -200,7 +198,9 @@ void StorageManager::create_gc_worker() {
void StorageManager::on_gc_finished(Result<FileStats> r_file_stats, bool dummy) { void StorageManager::on_gc_finished(Result<FileStats> r_file_stats, bool dummy) {
if (r_file_stats.is_error()) { if (r_file_stats.is_error()) {
LOG(ERROR) << "GC failed: " << r_file_stats.error(); if (r_file_stats.error().code() != 500) {
LOG(ERROR) << "GC failed: " << r_file_stats.error();
}
auto promises = std::move(pending_run_gc_); auto promises = std::move(pending_run_gc_);
for (auto &promise : promises) { for (auto &promise : promises) {
promise.set_error(r_file_stats.error().clone()); promise.set_error(r_file_stats.error().clone());