net/Socket.cpp | 3 +-- wsd/Admin.cpp | 1 + 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 36e6cae2ce6a9368ac8a58e88ccccc23addd3eaf Author: Michael Meeks <[email protected]> Date: Fri Jun 15 17:36:13 2018 +0100 Fix logging a little. Change-Id: I858ffb40e071eae3907eeff9c2d6291fd805dc02 Reviewed-on: https://gerrit.libreoffice.org/55884 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> diff --git a/net/Socket.cpp b/net/Socket.cpp index f2adc7e3f..48c37e2bb 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -161,7 +161,6 @@ void SocketPoll::insertNewWebSocketSync(const Poco::URI &uri, const std::shared_ { int fd = socket(ai->ai_addr->sa_family, SOCK_STREAM | SOCK_NONBLOCK, 0); int res = connect(fd, ai->ai_addr, ai->ai_addrlen); - // FIXME: SSL sockets presumably need some setup, checking etc. and ... =) if (fd < 0 || (res < 0 && errno != EINPROGRESS)) { LOG_ERR("Failed to connect to " << uri.getHost()); @@ -259,7 +258,7 @@ void StreamSocket::dumpState(std::ostream& os) if (_inBuffer.size() > 0) Util::dumpHex(os, "\t\tinBuffer:\n", "\t\t", _inBuffer); if (_outBuffer.size() > 0) - Util::dumpHex(os, "\t\toutBuffer:\n", "\t\t", _inBuffer); + Util::dumpHex(os, "\t\toutBuffer:\n", "\t\t", _outBuffer); } void StreamSocket::send(Poco::Net::HTTPResponse& response) diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp index 86db6153a..a48040d6a 100644 --- a/wsd/Admin.cpp +++ b/wsd/Admin.cpp @@ -677,6 +677,7 @@ public: void Admin::connectToMonitorSync(const std::string &uri) { + LOG_TRC("Add monitor " << uri); insertNewWebSocketSync(Poco::URI(uri), std::make_shared<MonitorSocketHandler>(this, uri)); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
