hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1220: Take the resource handler into use

Browse Source 
The resource handler system is now usable but it doesn't perform anything
useful. Although, this will allows it to be tested for correctness.

Minor fixes to HttpResponse output and renaming of functions.
This commit is contained in:
Markus Mäkelä
2017-04-17 10:36:33 +03:00
committed by Markus Mäkelä
parent 8b1c0cd1a1
commit 900bf2db5a
6 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/core/adminclient.cc
View File

@ -12,8 +12,6 @@
*/
#include "maxscale/adminclient.hh"
#include "maxscale/httprequest.hh"
#include "maxscale/httpresponse.hh"
#include <string>
#include <sstream>
@ -24,6 +22,10 @@
#include <maxscale/thread.h>
#include <maxscale/spinlock.hh>
#include "maxscale/httprequest.hh"
#include "maxscale/httpresponse.hh"
#include "maxscale/resource.hh"
using std::string;
using std::stringstream;
using mxs::SpinLockGuard;
@ -85,26 +87,21 @@ static bool write_response(int fd, const string& body)
void AdminClient::process()
{
string request;
string data;
atomic_write_int64(&m_last_activity, hkheartbeat);
if (read_request(m_fd, request))
if (read_request(m_fd, data))
{
string response;
SHttpRequest parser(HttpRequest::parse(request));
HttpResponse response(HTTP_400_BAD_REQUEST);
SHttpRequest request(HttpRequest::parse(data));
atomic_write_int64(&m_last_activity, hkheartbeat);
if (parser.get())
if (request.get())
{
/** Valid request */
response = HttpResponse(parser->get_json_str()).get_response();
}
else
{
request = HttpResponse("", HTTP_400_BAD_REQUEST).get_response();
response = resource_handle_request(*request);
}
if (!write_response(m_fd, response))
if (!write_response(m_fd, response.get_response()))
{
MXS_ERROR("Failed to write response to client: %d, %s", errno, mxs_strerror(errno));
}