#include "../../include/http/httpthread.h"\r
+#include "../../include/http/fmshttprequesthandlerfactory.h"\r
#include "../../include/option.h"\r
#include "../../include/stringfunctions.h"\r
-#include "../../include/http/pages/homepage.h"\r
-#include "../../include/http/pages/optionspage.h"\r
-#include "../../include/http/pages/showcaptchapage.h"\r
-#include "../../include/http/pages/createidentitypage.h"\r
-#include "../../include/http/pages/localidentitiespage.h"\r
-#include "../../include/http/pages/announceidentitypage.h"\r
-#include "../../include/http/pages/addpeerpage.h"\r
-#include "../../include/http/pages/peertrustpage.h"\r
+\r
+#include <Poco/Net/ServerSocket.h>\r
+#include <Poco/Net/HTTPServer.h>\r
+#include <Poco/Net/HTTPServerParams.h>\r
\r
#include <iostream>\r
\r
\r
HTTPThread::HTTPThread()\r
{\r
- std::string templatestr;\r
- int port;\r
- std::string portstr;\r
- Option::Instance()->Get("HTTPListenPort",portstr);\r
- StringFunctions::Convert(portstr,port);\r
-\r
- // set template\r
- templatestr="<html><head></head><body><a href=\"home.htm\">Home</a><br>[CONTENT]</body></html>";\r
- FILE *infile=fopen("template.htm","r+b");\r
- if(infile)\r
- {\r
- fseek(infile,0,SEEK_END);\r
- long len=ftell(infile);\r
- std::vector<char> data(len,0);\r
- fseek(infile,0,SEEK_SET);\r
- fread(&data[0],1,len,infile);\r
- fclose(infile);\r
- templatestr.assign(data.begin(),data.end());\r
- }\r
- else\r
- {\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"HTTPThread::HTTPThread could not open template.htm");\r
- }\r
-\r
- // push back page handlers\r
- m_pagehandlers.push_back(new ShowCaptchaPage());\r
- m_pagehandlers.push_back(new OptionsPage(templatestr));\r
- m_pagehandlers.push_back(new LocalIdentitiesPage(templatestr));\r
- m_pagehandlers.push_back(new CreateIdentityPage(templatestr));\r
- m_pagehandlers.push_back(new AnnounceIdentityPage(templatestr));\r
- m_pagehandlers.push_back(new AddPeerPage(templatestr));\r
- m_pagehandlers.push_back(new PeerTrustPage(templatestr));\r
- // homepage must be last - catch all page handler\r
- m_pagehandlers.push_back(new HomePage(templatestr));\r
-\r
- m_ctx=0;\r
- m_ctx=shttpd_init(NULL,"listen_ports",portstr.c_str(),NULL);\r
- shttpd_listen(m_ctx,port,false);\r
-\r
- shttpd_register_uri(m_ctx,"*",HTTPThread::PageCallback,this);\r
-\r
+ m_listenport=8080;\r
}\r
\r
-HTTPThread::~HTTPThread()\r
+void HTTPThread::run()\r
{\r
- shttpd_fini(m_ctx);\r
+ m_log->debug("HTTPThread::run thread started.");\r
\r
- for(std::vector<IPageHandler *>::iterator i=m_pagehandlers.begin(); i!=m_pagehandlers.end(); i++)\r
- {\r
- delete (*i);\r
- }\r
+ LoadDatabase();\r
+ Option option(m_db);\r
\r
-}\r
+ std::string portstr("8080");\r
+ option.Get("HTTPListenPort",portstr);\r
+ StringFunctions::Convert(portstr,m_listenport);\r
\r
-void HTTPThread::PageCallback(shttpd_arg *arg)\r
-{\r
+ try\r
+ {\r
+ Poco::Net::ServerSocket sock(m_listenport);\r
+ Poco::Net::HTTPServerParams* pParams = new Poco::Net::HTTPServerParams;\r
+ pParams->setMaxQueued(30);\r
+ pParams->setMaxThreads(5);\r
+ Poco::Net::HTTPServer srv(new FMSHTTPRequestHandlerFactory(m_db),sock,pParams);\r
\r
- HTTPThread *thread=(HTTPThread *)arg->user_data;\r
+ srv.start();\r
+ m_log->trace("Started HTTPServer");\r
\r
- for(std::vector<IPageHandler *>::iterator i=thread->m_pagehandlers.begin(); i!=thread->m_pagehandlers.end(); )\r
- {\r
- if((*i)->Handle(arg)==true)\r
+ do\r
{\r
- i=thread->m_pagehandlers.end();\r
- }\r
- else\r
+ Poco::Thread::sleep(1000);\r
+ }while(!IsCancelled());\r
+\r
+ m_log->trace("Trying to stop HTTPServer");\r
+ srv.stop();\r
+ m_log->trace("Stopped HTTPServer");\r
+ \r
+ m_log->trace("Waiting for current HTTP requests to finish");\r
+ while(srv.currentConnections()>0)\r
{\r
- i++;\r
+ Poco::Thread::sleep(500);\r
}\r
}\r
-\r
-}\r
-\r
-void HTTPThread::Run()\r
-{\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"HTTPThread::run thread started.");\r
-\r
- do\r
+ catch(Poco::Exception &e)\r
{\r
- shttpd_poll(m_ctx,1000);\r
- }while(!IsCancelled());\r
+ m_log->fatal("HTTPThread::run caught "+e.displayText());\r
+ }\r
+ catch(...)\r
+ {\r
+ m_log->fatal("HTTPThread::run caught unknown exception");\r
+ }\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"HTTPThread::run thread exiting.");\r
+ m_log->debug("HTTPThread::run thread exiting.");\r
\r
}\r
projects / fms.git / blobdiff