Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 06:06:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extend JSON API to shutdown retroshare gracefully

Browse source
This commit is contained in:
Gioacchino Mazzurco 2018-06-28 15:04:06 +02:00
parent 0ff80baed3
commit d511b6648e
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
5 changed files with 74 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libretroshare/src/jsonapi/jsonapi.cpp
View file

@ -21,8 +21,16 @@
// Generated at compile time
#include "jsonapi-wrappers.h"
JsonApiServer::JsonApiServer(uint16_t port) : mPort(port)
JsonApiServer::JsonApiServer(
uint16_t port, const std::function<void(int)> shutdownCallback) :
mPort(port), mShutdownCallback(shutdownCallback)
{
registerHandler("/jsonApiServer/shutdown",
[this](const std::shared_ptr<restbed::Session>)
{
shutdown();
});
// Generated at compile time
#include "jsonapi-register.inl"
}
@ -32,14 +40,22 @@ void JsonApiServer::run()
std::shared_ptr<rb::Settings> settings(new rb::Settings);
settings->set_port(mPort);
settings->set_default_header("Connection", "close");
service.start(settings);
mService.start(settings);
}
void JsonApiServer::registerHandler(const std::string& path, const std::function<void (const std::shared_ptr<restbed::Session>)>& handler)
void JsonApiServer::registerHandler(
const std::string& path,
const std::function<void (const std::shared_ptr<restbed::Session>)>& handler)
{
std::shared_ptr<restbed::Resource> resource(new rb::Resource);
resource->set_path(path);
resource->set_method_handler("GET", handler);
resource->set_method_handler("POST", handler);
service.publish(resource);
mService.publish(resource);
}
void JsonApiServer::shutdown(int exitCode)
{
mService.stop();
mShutdownCallback(exitCode);
}

20
libretroshare/src/jsonapi/jsonapi.h
View file

@ -39,12 +39,15 @@ void createChannelHandler(const std::shared_ptr<rb::Session> session);
*/
struct JsonApiServer : RsSingleJobThread
{
JsonApiServer(uint16_t port);
JsonApiServer(
uint16_t port,
const std::function<void(int)> shutdownCallback = [](int){} );
/// @see RsSingleJobThread
virtual void run();
/**
* @param[in] path Path itno which publish the API call
* @param[in] handler function which will be called to handle the requested
* path, the function must be declared like:
* \code{.cpp}
@ -55,8 +58,21 @@ struct JsonApiServer : RsSingleJobThread
const std::string& path,
const std::function<void(const std::shared_ptr<rb::Session>)>& handler );
/**
* @brief Shutdown the JSON API server and call shutdownCallback
* @jsonapi{development}
* Beware that this method shout down only the JSON API server instance not
* the whole RetroShare instance, this behaviour can be altered via
* shutdownCallback paramether of @see JsonApiServer::JsonApiServer
* This method is made available also via JSON API with path
* /jsonApiServer/shutdown
* @param exitCode just passed down to the shutdownCallback
*/
void shutdown(int exitCode = 0);
private:
uint16_t mPort;
rb::Service service;
rb::Service mService;
const std::function<void(int)> mShutdownCallback;
};