diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2022-01-31 22:20:31 -0500 |
|---|---|---|
| committer | Ashod Nakashian <Ashod@users.noreply.github.com> | 2022-02-04 10:26:49 -0500 |
| commit | 77579897959d35e428cb78edf361d5aedf65b25d (patch) | |
| tree | edfb777f8581631d3352d6d39aab1006aacbbbd0 /wsd/DocumentBroker.cpp | |
| parent | wsd: test: reduce UnitWOPISlow document size (diff) | |
| download | online-77579897959d35e428cb78edf361d5aedf65b25d.tar.gz online-77579897959d35e428cb78edf361d5aedf65b25d.zip | |
wsd: save -> upload
Probably the last remaining incorrectly labelled
helper that checks for in-progress uploads, but
had retained the old and misleading label of 'save'.
Change-Id: I693275b1559f3dae4e9e3ab2408d997f56ff86e3
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
Diffstat (limited to 'wsd/DocumentBroker.cpp')
| -rw-r--r-- | wsd/DocumentBroker.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 5634c1805d..1b141a881d 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -434,7 +434,7 @@ void DocumentBroker::pollThread() // Nothing to do; no sessions, not loaded, marked to destroy. stop("dead"); } - else if (_saveManager.isSaving() || isAsyncSaveInProgress()) + else if (_saveManager.isSaving() || isAsyncUploading()) { LOG_DBG("Don't terminate dead DocumentBroker: async saving in progress for docKey [" << getDocKey() << "]."); continue; @@ -1830,7 +1830,7 @@ void DocumentBroker::autoSaveAndStop(const std::string& reason) { LOG_TRC("autoSaveAndStop for docKey [" << getDocKey() << ']'); - if (_saveManager.isSaving() || isAsyncSaveInProgress()) + if (_saveManager.isSaving() || isAsyncUploading()) { LOG_TRC("Async saving/uploading in progress for docKey [" << getDocKey() << ']'); return; @@ -1876,7 +1876,7 @@ void DocumentBroker::autoSaveAndStop(const std::string& reason) constexpr bool success = true; std::string result; checkAndUploadToStorage(sessionId, success, result); - if (isAsyncSaveInProgress()) + if (isAsyncUploading()) { LOG_DBG("Uploading document before stopping."); return; @@ -2109,7 +2109,7 @@ std::size_t DocumentBroker::removeSession(const std::string& id) // Last view going away; can destroy? if (isLastSession) { - if (_saveManager.isSaving() || isAsyncSaveInProgress()) + if (_saveManager.isSaving() || isAsyncUploading()) { // Don't destroy just yet, wait until save and upload are done. // Notice that the save and/or upload could have been triggered @@ -3406,7 +3406,7 @@ void DocumentBroker::dumpState(std::ostream& os) #endif } -bool DocumentBroker::isAsyncSaveInProgress() const +bool DocumentBroker::isAsyncUploading() const { if (!_storage) return false; |