wsd/DocumentBroker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 9bc70150c856e8d671ade99e1d2024a8f0f45d9d Author: Ashod Nakashian <[email protected]> AuthorDate: Wed Feb 13 17:42:05 2019 -0500 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Feb 25 11:42:40 2019 +0100 Fix PostMessageOrigin typo in log Change-Id: I3d41c832561f9de1b46ef1444d8d0b1d633c7b63 Reviewed-on: https://gerrit.libreoffice.org/68249 Reviewed-by: Szymon Kłos <[email protected]> Tested-by: Szymon Kłos <[email protected]> diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index d5ade812e..b0052142e 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -219,6 +219,7 @@ void DocumentBroker::pollThread() std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - _threadStart).count() > timeoutMs) break; + // Nominal time between retries, lest we busy-loop. getNewChild could also wait, so don't double that here. std::this_thread::sleep_for(std::chrono::milliseconds(CHILD_REBALANCE_INTERVAL_MS / 10)); } @@ -501,7 +502,6 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s #ifndef MOBILEAPP std::chrono::duration<double> getInfoCallDuration(0); - WopiStorage* wopiStorage = dynamic_cast<WopiStorage*>(_storage.get()); if (wopiStorage != nullptr) { @@ -527,7 +527,7 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s (LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination())) { wopifileinfo->getPostMessageOrigin().replace(0, 4, "https"); - LOG_DBG("Updating PostMessageOrgin scheme to HTTPS. Updated origin is [" << wopifileinfo->getPostMessageOrigin() << "]."); + LOG_DBG("Updating PostMessageOrigin scheme to HTTPS. Updated origin is [" << wopifileinfo->getPostMessageOrigin() << "]."); } wopiInfo->set("PostMessageOrigin", wopifileinfo->getPostMessageOrigin()); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
