diff options
| author | Dan Engelbrecht <[email protected]> | 2024-03-18 13:24:10 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2024-03-18 13:24:10 +0100 |
| commit | 927bf8f073e8f1f994cbc7f593a442890722a05f (patch) | |
| tree | 5c93fb0765ef28b674460c6bd1ca84c0d4948358 /src/zenserver/projectstore/remoteprojectstore.cpp | |
| parent | add a retry when trying to create the lock file (#9) (diff) | |
| download | zen-927bf8f073e8f1f994cbc7f593a442890722a05f.tar.xz zen-927bf8f073e8f1f994cbc7f593a442890722a05f.zip | |
read jupiter token from file (#10)
* Add ability to specify a json file for cloud access token
OidcToken.exe in UE can be asked to produce such a file with the -OutFile option
* avoid division by zero when reporting progress
Diffstat (limited to 'src/zenserver/projectstore/remoteprojectstore.cpp')
| -rw-r--r-- | src/zenserver/projectstore/remoteprojectstore.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/zenserver/projectstore/remoteprojectstore.cpp b/src/zenserver/projectstore/remoteprojectstore.cpp index ce3411114..ab207930f 100644 --- a/src/zenserver/projectstore/remoteprojectstore.cpp +++ b/src/zenserver/projectstore/remoteprojectstore.cpp @@ -492,7 +492,10 @@ BuildContainer(CidStore& ChunkStore, fmt::format("Aborting ({}): {}", RemoteResult.GetError(), RemoteResult.GetErrorReason())); return {}; } - ReportProgress(OptionalContext, fmt::format("Building oplog: {} ops processed", OpCount), TotalOpCount, 0); + if (TotalOpCount > 0) + { + ReportProgress(OptionalContext, fmt::format("Building oplog: {} ops processed", OpCount), TotalOpCount, 0); + } } SectionOpsWriter.EndArray(); // "ops" @@ -1177,10 +1180,14 @@ BuildContainer(CidStore& ChunkStore, } } - ReportProgress(OptionalContext, - fmt::format("Assembling blocks: {} attachments processed, {} blocks assembled", ChunksAssembled, ComposedBlocks), - ChunkAssembleCount, - 0); + if (ChunkAssembleCount > 0) + { + ReportProgress( + OptionalContext, + fmt::format("Assembling blocks: {} attachments processed, {} blocks assembled", ChunksAssembled, ComposedBlocks), + ChunkAssembleCount, + 0); + } ReportMessage(OptionalContext, fmt::format("Built oplog and collected {} attachments from {} ops into {} blocks and in {}", |