From 406a7dd59e09dfdffbb9d1516f4a10df6e0dff9c Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Wed, 13 Feb 2019 17:42:05 -0500 Subject: [PATCH] Fix PostMessageOrigin typo in log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3d41c832561f9de1b46ef1444d8d0b1d633c7b63 Reviewed-on: https://gerrit.libreoffice.org/68249 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos (cherry picked from commit 9bc70150c856e8d671ade99e1d2024a8f0f45d9d) Reviewed-on: https://gerrit.libreoffice.org/68390 --- wsd/DocumentBroker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index e615b6d04..8f86c0398 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -208,6 +208,7 @@ void DocumentBroker::pollThread() std::chrono::duration_cast(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)); } @@ -489,7 +490,6 @@ bool DocumentBroker::load(const std::shared_ptr& session, const s #if !MOBILEAPP std::chrono::duration getInfoCallDuration(0); - WopiStorage* wopiStorage = dynamic_cast(_storage.get()); if (wopiStorage != nullptr) { @@ -515,7 +515,7 @@ bool DocumentBroker::load(const std::shared_ptr& 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());