diff options
| author | Dan Engelbrecht <[email protected]> | 2024-08-12 10:13:37 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2024-08-12 10:13:37 +0200 |
| commit | 0eb5c60130c674e1bc0735e1ff3a32f7062294c8 (patch) | |
| tree | 8d378843515aef3ebf3441e64d88e84588bc648d /src/zenserver/projectstore/httpprojectstore.cpp | |
| parent | fix compilation issue with recent VS toolchains (#103) (diff) | |
| download | zen-0eb5c60130c674e1bc0735e1ff3a32f7062294c8.tar.xz zen-0eb5c60130c674e1bc0735e1ff3a32f7062294c8.zip | |
project/oplog delete improvements (#105)
* make oplog/project folder removeal more robust
* report back error to http caller if removal fails
Diffstat (limited to 'src/zenserver/projectstore/httpprojectstore.cpp')
| -rw-r--r-- | src/zenserver/projectstore/httpprojectstore.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp index 83038372e..585cee26f 100644 --- a/src/zenserver/projectstore/httpprojectstore.cpp +++ b/src/zenserver/projectstore/httpprojectstore.cpp @@ -1381,10 +1381,17 @@ HttpProjectService::HandleOpLogRequest(HttpRouterRequest& Req) { ZEN_INFO("deleting oplog '{}/{}'", ProjectId, OplogId); - Project->DeleteOplog(OplogId); - - m_ProjectStats.OpLogDeleteCount++; - return HttpReq.WriteResponse(HttpResponseCode::OK); + if (Project->DeleteOplog(OplogId)) + { + m_ProjectStats.OpLogDeleteCount++; + return HttpReq.WriteResponse(HttpResponseCode::OK); + } + else + { + return HttpReq.WriteResponse(HttpResponseCode::Locked, + HttpContentType::kText, + fmt::format("oplog {}/{} is in use", ProjectId, OplogId)); + } } break; |