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

Fix global shutdown call from JSON API

Browse source
This commit is contained in:
Gioacchino Mazzurco 2020-01-27 23:40:18 +01:00
parent 5dbbe1ffd7
commit 8c9310f754
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -248,7 +248,13 @@ JsonApiServer::JsonApiServer(): configMutex("JsonApiServer config"),
{ {
INITIALIZE_API_CALL_JSON_CONTEXT; INITIALIZE_API_CALL_JSON_CONTEXT;
DEFAULT_API_CALL_JSON_RETURN(rb::OK); DEFAULT_API_CALL_JSON_RETURN(rb::OK);
rsControl->rsGlobalShutDown();
/* Wrap inside RsThread::async because this call
* RsThread::fullstop() also on JSON API server thread.
* Calling RsThread::fullstop() from it's own thread should never
* happen and if it happens an error message is printed
* accordingly by RsThread::fullstop() */
RsThread::async([](){ rsControl->rsGlobalShutDown(); });
} ); } );
}, true); }, true);

4
libretroshare/src/rsserver/rsinit.cc
View file

@ -397,8 +397,8 @@ int RsInit::InitRetroShare(const RsConfigOptions& conf)
#ifdef RS_JSONAPI #ifdef RS_JSONAPI
// We create the JsonApiServer this early, because it is needed *before* login // We create the JsonApiServer this early, because it is needed *before* login
RsInfo() << __PRETTY_FUNCTION__ RsDbg() << __PRETTY_FUNCTION__
<< "Allocating jsonAPI server (not launched yet)" << std::endl; << " Allocating JSON API server (not launched yet)" << std::endl;
JsonApiServer* jas = new JsonApiServer(); JsonApiServer* jas = new JsonApiServer();
jas->setListeningPort(conf.jsonApiPort); jas->setListeningPort(conf.jsonApiPort);
jas->setBindingAddress(conf.jsonApiBindAddress); jas->setBindingAddress(conf.jsonApiBindAddress);