[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLWSD.cpp loolwsd/Makefile.am
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Thu May 12 15:23:15 UTC 2016
loolwsd/LOOLWSD.cpp | 5 +++--
loolwsd/Makefile.am | 7 +++++++
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 9376156ac34de6c28455ef1c14a65dcd0230ba83
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Thu May 12 10:37:54 2016 -0400
loolwsd: correct error report while loading
Change-Id: I4e5e4dd1318144255294011c70c6d2bbfd74c1d8
Reviewed-on: https://gerrit.libreoffice.org/24932
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 6a726de..f2b47ad 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -590,8 +590,9 @@ private:
// Remove.
std::unique_lock<std::mutex> lock(docBrokersMutex);
docBrokers.erase(docKey);
- throw WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
}
+
+ throw WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
}
// Validate the URI and Storage before moving on.
@@ -820,7 +821,7 @@ public:
const std::string msg = std::string("error: ") + exc.what();
ws->sendFrame(msg.data(), msg.size());
// abnormal close frame handshake
- ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, exc.what());
+ ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, msg);
}
catch (const std::exception& exc2)
{
commit 021209e44d3d6ce382a66df351474331c90d8310
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Thu May 12 07:24:38 2016 -0400
loolwsd: new run_valgrind target to run loolwsd under valgrind
Change-Id: Ic1962428bc7ed4c08b7655c41a1d38af6eeddf75
Reviewed-on: https://gerrit.libreoffice.org/24931
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 298909a..8d92a3f 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -140,6 +140,12 @@ run: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo
./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
--childroot="@JAILS_PATH@" --allowlocalstorage --admincreds=admin/admin
+
+run_valgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
+ @echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
+ valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
+ ./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
+ --childroot="@JAILS_PATH@" --allowlocalstorage --admincreds=admin/admin
else
SYSTEM_STAMP =
@@ -164,3 +170,4 @@ all-local: loolforkit @JAILS_PATH@ $(SYSTEM_STAMP)
else \
echo "Skipping capability setting"; \
fi
+
More information about the Libreoffice-commits
mailing list