mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle snapshots during unkown file backups cleanup

Browse Source
This commit is contained in:
Martin 2013-04-19 21:53:19 +02:00
parent 298ac718dc
commit 0ca8f67783
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
urbackupserver/server_cleanup.cpp
View File

@ -400,10 +400,26 @@ void ServerCleanupThread::do_remove(void)
if(res.empty())
{
Server->Log(L"File backup \""+cf.name+L"\" of client \""+clientname+L"\" not found in database. Deleting it.", LL_WARNING);
std::wstring rm_dir=backupfolder+os_file_sep()+clientname+os_file_sep()+cf.name;
if(!os_remove_nonempty_dir(rm_dir))
bool remove_folder=false;
if(BackupServer::isSnapshotsEnabled())
{
Server->Log(L"Could not delete directory \""+rm_dir+L"\"", LL_ERROR);
if(!SnapshotHelper::removeFilesystem(clientname, cf.name) )
{
remove_folder=true;
}
}
else
{
remove_folder=true;
}
if(remove_folder)
{
std::wstring rm_dir=backupfolder+os_file_sep()+clientname+os_file_sep()+cf.name;
if(!os_remove_nonempty_dir(rm_dir))
{
Server->Log(L"Could not delete directory \""+rm_dir+L"\"", LL_ERROR);
}
}
}
}