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

fixed a few bugs. First running version.

Browse source
This commit is contained in:
csoler 2019-11-10 21:29:26 +01:00
parent 0103a741d6
commit 3446f0b677
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
5 changed files with 73 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libretroshare/src/rsserver/p3webui.cc
View file

@ -47,6 +47,13 @@ static constexpr char *mime_types[3] = {
"image/svg+xml"
};
#ifdef WINDOWS_SYS
static std::string _base_directory = "data/webui";
#else
static std::string _base_directory = "/usr/share/retroshare/webui/";
#endif
template<int MIME_TYPE_INDEX> class handler
{
public:
@ -79,16 +86,8 @@ template<int MIME_TYPE_INDEX> class handler
session->close( restbed::NOT_FOUND );
}
}
static std::string _base_directory ;
};
#ifdef WINDOWS_SYS
template<int MIME_TYPE_INDEX> std::string handler<MIME_TYPE_INDEX>::_base_directory = "data/webui";
#else
template<int MIME_TYPE_INDEX> std::string handler<MIME_TYPE_INDEX>::_base_directory = "/usr/share/retroshare/webui/";
#endif
static void service_ready_handler( restbed::Service& )
{
fprintf( stderr, "Hey! The service is up and running." );
@ -100,7 +99,7 @@ public:
WebUIThread()
{
_service = std::make_shared<restbed::Service>();
_listening_port = 1984;
}
void runloop() override
@ -128,7 +127,7 @@ public:
resource3->set_method_handler( "GET", handler<TEXT_SVG>::get_handler );
auto settings = std::make_shared< restbed::Settings >( );
settings->set_port( 1984 );
settings->set_port( _listening_port );
settings->set_default_header( "Connection", "close" );
_service->publish( resource1 );
@ -136,7 +135,16 @@ public:
_service->publish( resource3 );
_service->set_ready_handler( service_ready_handler );
_service->start( settings );
try
{
_service->start( settings );
}
catch(std::exception& e)
{
RsErr() << "Could not start web interface: " << e.what() << std::endl;
return;
}
}
void stop()
{
@ -148,8 +156,12 @@ public:
sleep(1);
}
void setListeningPort(uint16_t p) { _listening_port = p ; }
uint16_t listeningPort() const { return _listening_port;}
private:
std::shared_ptr<restbed::Service> _service;
uint16_t _listening_port;
};
p3WebUI::p3WebUI()
@ -169,7 +181,7 @@ p3WebUI::~p3WebUI()
bool p3WebUI::restart()
{
RsDbg() << "Restarting web interface listening on port " << _listening_port << std::endl;
RsDbg() << "Restarting web interface listening on port " << _webui_thread->listeningPort() << std::endl;
if(_webui_thread->isRunning())
_webui_thread->stop();
@ -186,11 +198,11 @@ bool p3WebUI::stop()
void p3WebUI::setHtmlFilesDirectory(const std::string& html_dir)
{
_html_files_directory = html_dir;
_base_directory = html_dir;
}
void p3WebUI::setListeningPort(uint16_t port)
{
_listening_port = port;
_webui_thread->setListeningPort(port);
if(_webui_thread->isRunning())
restart();

3
libretroshare/src/rsserver/p3webui.h
View file

@ -41,9 +41,6 @@ public:
private:
WebUIThread *_webui_thread;
std::string _html_files_directory;
uint16_t _listening_port;
};