diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2020-03-08 14:33:47 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2020-03-12 13:23:57 +0100 |
| commit | a0cdafca41f41638214fc0f59006bd7f1e4e67f5 (patch) | |
| tree | 8da31d6d0f09dbfa0360f91826bf24ec7e91dba8 /net | |
| parent | a86508d815013c40e3ae8c494b883e112a7195f2 (diff) | |
wsd: some logging improvements
Change-Id: Icf4c4845e10f44fe1518e58ea598c2d1053b40c1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90357
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/Socket.hpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/net/Socket.hpp b/net/Socket.hpp index 99fdf259a..b15aeb21b 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -588,8 +588,8 @@ public: int rc; do { - LOG_TRC("Poll start"); #if !MOBILEAPP + LOG_TRC("Poll start, timeoutMs: " << timeoutMaxMs); rc = ::poll(&_pollFds[0], size + 1, std::max(timeoutMaxMs,0)); #else LOG_TRC("SocketPoll Poll"); @@ -1106,12 +1106,14 @@ protected: // Always try to read. closed = !readIncomingData() || closed; + LOG_TRC("#" << getFD() << ": Incoming data buffer " << _inBuffer.size() << + " bytes, closeSocket? " << closed); + +#ifdef LOG_SOCKET_DATA auto& log = Log::logger(); - if (log.trace()) { - LOG_TRC("#" << getFD() << ": Incoming data buffer " << _inBuffer.size() << - " bytes, closeSocket? " << closed); - // log.dump("", &_inBuffer[0], _inBuffer.size()); - } + if (log.trace() && _inBuffer.size() > 0) + log.dump("", &_inBuffer[0], _inBuffer.size()); +#endif // If we have data, allow the app to consume. size_t oldSize = 0; @@ -1174,12 +1176,14 @@ public: len = writeData(&_outBuffer[0], std::min((int)_outBuffer.size(), getSendBufferSize())); + LOG_TRC("#" << getFD() << ": Wrote outgoing data " << len << " bytes of " + << _outBuffer.size() << " bytes buffered."); + +#ifdef LOG_SOCKET_DATA auto& log = Log::logger(); - if (log.trace() && len > 0) { - LOG_TRC("#" << getFD() << ": Wrote outgoing data " << len << - " bytes of " << _outBuffer.size() << " bytes buffered."); - // log.dump("", &_outBuffer[0], len); - } + if (log.trace() && len > 0) + log.dump("", &_outBuffer[0], len); +#endif if (len <= 0 && errno != EAGAIN && errno != EWOULDBLOCK) LOG_SYS("#" << getFD() << ": Socket write returned " << len); |