Commit 80092f03 authored by Hubert Denkmair's avatar Hubert Denkmair

answer stats with correct content type

parent 3d07e2f4
...@@ -58,14 +58,13 @@ int RelayServer::Run() ...@@ -58,14 +58,13 @@ int RelayServer::Run()
); );
_tcpProtocol.SetStatsReceivedCallback([this](const MsgPackProtocol::BotStatsMessage& msg) { _tcpProtocol.SetStatsReceivedCallback([this](const MsgPackProtocol::BotStatsMessage& msg) {
/*std::string content = json(msg).dump(); std::string content = json(msg).dump();
std::stringstream s; std::stringstream s;
s << "HTTP/1.0 200 OK\r\n"; s << "HTTP/1.0 200 OK\r\n";
s << "Content-Length: " << content.size() << "\r\n"; s << "Content-Length: " << content.size() << "\r\n";
s << "Content-Type: application/json\r\n\r\n"; s << "Content-Type: application/json; charset=UTF-8\r\n\r\n";
s << content; s << content;
_statsHTTPResponse = s.str();*/ _statsHTTPResponse = s.str();
_statsHTTPResponse = json(msg).dump();
}); });
epoll.AddFileDescriptor(_clientSocket, EPOLLIN|EPOLLPRI|EPOLLERR); epoll.AddFileDescriptor(_clientSocket, EPOLLIN|EPOLLPRI|EPOLLERR);
...@@ -76,6 +75,7 @@ int RelayServer::Run() ...@@ -76,6 +75,7 @@ int RelayServer::Run()
ws->setUserData(new WebsocketConnection(ws)); ws->setUserData(new WebsocketConnection(ws));
} }
); );
h.onDisconnection( h.onDisconnection(
[](uWS::WebSocket<uWS::SERVER> *ws, int code, const char *message, size_t length) [](uWS::WebSocket<uWS::SERVER> *ws, int code, const char *message, size_t length)
{ {
...@@ -116,7 +116,8 @@ int RelayServer::Run() ...@@ -116,7 +116,8 @@ int RelayServer::Run()
{ {
if ((req.getMethod()==uWS::METHOD_GET) && (req.getUrl().toString()=="/stats")) if ((req.getMethod()==uWS::METHOD_GET) && (req.getUrl().toString()=="/stats"))
{ {
res->end(_statsHTTPResponse.data(), _statsHTTPResponse.length()); res->write(_statsHTTPResponse.data(), _statsHTTPResponse.length());
res->end();
return; return;
} }
res->end(response.data(), response.length()); res->end(response.data(), response.length());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment