strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve logged message: setclientpart syntax error

Browse source 
Don't show error to the user as it is not critical
but put in the logs more meaningful message so we can debbug
later.

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I7b27a19ac7af845de74d7a4fb65682dfe03c042d
This commit is contained in:
Szymon Kłos 2024-01-03 11:20:15 +01:00 committed by Szymon Kłos
parent eef78a5c5a
commit 8c6e2ecbdc
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wsd/ClientSession.cpp
View file

@ -56,6 +56,14 @@ const int ProxyAccessTokenLengthBytes = 32;
static std::mutex GlobalSessionMapMutex;
static std::unordered_map<std::string, std::weak_ptr<ClientSession>> GlobalSessionMap;
namespace
{
void logSyntaxErrorDetails(const StringVector& tokens, const std::string& firstLine)
{
LOG_WRN("Invalid syntax for '" << tokens[0] << "' message: [" << firstLine << ']');
}
}
ClientSession::ClientSession(
const std::shared_ptr<ProtocolHandlerInterface>& ws,
const std::string& id,
@ -748,7 +756,7 @@ bool ClientSession::_handleInput(const char *buffer, int length)
{
// Be forgiving and log instead of disconnecting.
// sendTextFrameAndLogError("error: cmd=clientvisiblearea kind=syntax");
LOG_WRN("Invalid syntax for '" << tokens[0] << "' message: [" << firstLine << ']');
logSyntaxErrorDetails(tokens, firstLine);
return true;
}
else
@ -759,7 +767,7 @@ bool ClientSession::_handleInput(const char *buffer, int length)
if (!getTokenInteger(tokens[5], "splitx", splitX) ||
!getTokenInteger(tokens[6], "splity", splitY))
{
LOG_WRN("Invalid syntax for '" << tokens[0] << "' message: [" << firstLine << ']');
logSyntaxErrorDetails(tokens, firstLine);
return true;
}
@ -779,7 +787,7 @@ bool ClientSession::_handleInput(const char *buffer, int length)
if (tokens.size() != 2 ||
!getTokenInteger(tokens[1], "part", temp))
{
sendTextFrameAndLogError("error: cmd=setclientpart kind=syntax");
logSyntaxErrorDetails(tokens, firstLine);
return false;
}
else
@ -838,7 +846,7 @@ bool ClientSession::_handleInput(const char *buffer, int length)
{
// Be forgiving and log instead of disconnecting.
// sendTextFrameAndLogError("error: cmd=clientzoom kind=syntax");
LOG_WRN("Invalid syntax for '" << tokens[0] << "' message: [" << firstLine << ']');
logSyntaxErrorDetails(tokens, firstLine);
return true;
}
else
@ -858,7 +866,7 @@ bool ClientSession::_handleInput(const char *buffer, int length)
{
// Be forgiving and log instead of disconnecting.
// sendTextFrameAndLogError("error: cmd=tileprocessed kind=syntax");
LOG_WRN("Invalid syntax for '" << tokens[0] << "' message: [" << firstLine << ']');
logSyntaxErrorDetails(tokens, firstLine);
return true;
}