From c6a24d7b46e3e26279ba82b02a0ddf75d8a186ba Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 7 Apr 2014 22:53:26 +0200 Subject: [PATCH] WIP --- main/RemoteServerService.cpp | 6 +++--- main/WebServerService.cpp | 18 ++++++++++++++---- main/main.cpp | 6 ++++-- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/main/RemoteServerService.cpp b/main/RemoteServerService.cpp index 93fee736..1c09f0d1 100644 --- a/main/RemoteServerService.cpp +++ b/main/RemoteServerService.cpp @@ -9,7 +9,7 @@ RemoteServerService::RemoteServerService(const Remote::Server::Server::endpoint_ void RemoteServerService::start(void) { - std::cout << "émoteServerService::start, starting..." << std::endl; + std::cout << "RemoteServerService::start, starting..." << std::endl; _server.run(); } @@ -17,12 +17,12 @@ RemoteServerService::start(void) void RemoteServerService::stop(void) { - std::cout << "émoteServerService::stop, stopping..." << std::endl; + std::cout << "RemoteServerService::stop, stopping..." << std::endl; _server.stop(); } void RemoteServerService::restart(void) { - std::cout << "émoteServerService::restart, not implemented!" << std::endl; + std::cout << "RemoteServerService::restart, not implemented!" << std::endl; } diff --git a/main/WebServerService.cpp b/main/WebServerService.cpp index adbbaa63..970800e1 100644 --- a/main/WebServerService.cpp +++ b/main/WebServerService.cpp @@ -1,3 +1,5 @@ +#include +#include #include "WebServerService.hpp" #include "ui/LmsApplication.hpp" @@ -9,14 +11,16 @@ Wt::WApplication *createApplication(const Wt::WEnvironment& env) * You could read information from the environment to decide whether * the user has permission to start a new application */ + std::cout << "Creating new Application" << std::endl; return new LmsApplication(env); } - WebServerService::WebServerService( int argc, char* argv[]) -: _server(argv[0]) +: _server(argv[0], "") { + std::cout << "Constructing server... argc = " << argc << std::endl; + // TODO configure server _server.setServerConfiguration (argc, argv, WTHTTP_CONFIGURATION); @@ -24,18 +28,24 @@ WebServerService::WebServerService( int argc, char* argv[]) _server.addEntryPoint(Wt::Application, createApplication); + std::cout << "WebServerService done!" << std::endl; } void WebServerService::start(void) { - _server.start(); + std::cout << "Starting service..." << std::endl; + + bool res = _server.start(); + std::cout << "_server.start returned " << std::boolalpha << res << std::endl; + + std::cout << "Service started..." << std::endl; } void WebServerService::stop(void) { - _server.stop(); + _server.stop(); } void diff --git a/main/main.cpp b/main/main.cpp index a14912e4..21f048aa 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -9,6 +9,8 @@ #include "WebServerService.hpp" #include "RemoteServerService.hpp" +void toto(int argc, char* argv[]); + int main(int argc, char* argv[]) { @@ -22,9 +24,9 @@ int main(int argc, char* argv[]) Av::AvInit(); Transcode::AvConvTranscoder::init(); - serviceManager.startService( std::make_shared( "test.db" ) ); +// serviceManager.startService( std::make_shared( "test.db" ) ); serviceManager.startService( std::make_shared(argc, argv) ); - serviceManager.startService( std::make_shared( Remote::Server::Server::endpoint_type() ) ); +// serviceManager.startService( std::make_shared( Remote::Server::Server::endpoint_type() ) ); serviceManager.run();