提交 72f290ebdac147e7702a770e48c3cfa17de86a2a

作者 WZP 万忠平
1 个父辈 7ddd0ecd

wan

... ... @@ -23,10 +23,10 @@ using namespace std;
23 23 namespace fs = boost::filesystem;
24 24
25 25 bool DmpMainServer::initialized_ = false;
26   -string DmpMainServer::module_path_ = "";
27   -string DmpMainServer::service_path_ = "";
  26 +string DmpMainServer::modulePath_ = "";
  27 +string DmpMainServer::servicePath_ = "";
28 28 DmpServerManager *DmpMainServer::serverManager_ = nullptr;
29   -DmpServerInterfaceImpl *DmpMainServer::server_interface_ = nullptr;
  29 +DmpServerInterfaceImpl *DmpMainServer::serverInterface_ = nullptr;
30 30
31 31 DmpMainServer::DmpMainServer()
32 32 {
... ... @@ -41,13 +41,13 @@ bool DmpMainServer::Init()
41 41 return false;
42 42 }
43 43 LOGGER_INFO("-------------------dmap server init start--------------------");
44   - service_path_ = DmpApplication::Instance()->pkgDataPath() + "services";
  44 + servicePath_ = DmpApplication::Instance()->pkgDataPath() + "services";
45 45 serverManager_ = new DmpServerManager();
46   - server_interface_ = new DmpServerInterfaceImpl();
  46 + serverInterface_ = new DmpServerInterfaceImpl();
47 47 // Load service module
48   - module_path_ = DmpApplication::Instance()->libexecPath() + "server";
49   - LOGGER_DEBUG("Initializing server modules from " + module_path_);
50   - serverManager_->init(module_path_);
  48 + modulePath_ = DmpApplication::Instance()->libexecPath() + "server";
  49 + LOGGER_DEBUG("Initializing server modules from " + modulePath_);
  50 + serverManager_->init(modulePath_);
51 51
52 52 #ifdef HAVE_SERVER_PYTHON_PLUGINS
53 53 InitPython();
... ... @@ -61,7 +61,7 @@ bool DmpMainServer::Init()
61 61 void DmpMainServer::HandleRequest(DmpServerRequest &request, DmpServerResponse &response)
62 62 {
63 63 LOGGER_DEBUG("DmpMainServer: HandleRequest");
64   - DmpFilterResponseDecorator responseDecorator(server_interface_->Filters(), response);
  64 + DmpFilterResponseDecorator responseDecorator(serverInterface_->filters(), response);
65 65 DmpRequestHandler requestHandler(request, response);
66 66 try
67 67 {
... ... @@ -73,7 +73,7 @@ void DmpMainServer::HandleRequest(DmpServerRequest &request, DmpServerResponse &
73 73 }
74 74
75 75 // Set the request handler into the interface for plugins to manipulate it
76   - server_interface_->SetRequestHandler(&requestHandler);
  76 + serverInterface_->setRequestHandler(&requestHandler);
77 77
78 78 try
79 79 {
... ...
... ... @@ -30,10 +30,10 @@ public:
30 30
31 31 private:
32 32 static bool initialized_;
33   - static DmpServerInterfaceImpl *server_interface_;
  33 + static DmpServerInterfaceImpl *serverInterface_;
34 34 static DmpServerManager *serverManager_;
35   - static std::string module_path_;
36   - static std::string service_path_;
  35 + static std::string modulePath_;
  36 + static std::string servicePath_;
37 37 };
38 38
39 39 #endif // __dmpmainserver_h__
\ No newline at end of file
... ...
... ... @@ -9,22 +9,22 @@
9 9 #include "dmpserverfilter.h"
10 10 #include "dmplogger.h"
11 11
12   -DmpServerFilter::DmpServerFilter(DmpServerInterface *server_interface) :
13   - server_interface_(server_interface)
  12 +DmpServerFilter::DmpServerFilter(DmpServerInterface *serverInterface) :
  13 + serverInterface_(serverInterface)
14 14 {
15 15 }
16 16
17   -void DmpServerFilter::RequestReady()
  17 +void DmpServerFilter::requestReady()
18 18 {
19 19 LOGGER_DEBUG("DmpServerFilter plugin default requestReady called");
20 20 }
21 21
22   -void DmpServerFilter::ResponseComplete()
  22 +void DmpServerFilter::responseComplete()
23 23 {
24 24 LOGGER_DEBUG("DmpServerFilter plugin default responseComplete called");
25 25 }
26 26
27   -void DmpServerFilter::SendResponse()
  27 +void DmpServerFilter::sendResponse()
28 28 {
29 29 LOGGER_DEBUG("DmpServerFilter plugin default sendResponse called");
30 30 }
... ...
... ... @@ -18,20 +18,20 @@ class DmpServerInterface;
18 18 class SERVER_EXPORT DmpServerFilter
19 19 {
20 20 public:
21   - DmpServerFilter(DmpServerInterface *server_interface);
  21 + DmpServerFilter(DmpServerInterface *serverInterface);
22 22
23 23 virtual ~DmpServerFilter() = default;
24 24
25   - DmpServerInterface *server_interface() { return server_interface_; }
  25 + DmpServerInterface *serverInterface() { return serverInterface_; }
26 26
27   - virtual void RequestReady();
  27 + virtual void requestReady();
28 28
29   - virtual void ResponseComplete();
  29 + virtual void responseComplete();
30 30
31   - virtual void SendResponse();
  31 + virtual void sendResponse();
32 32
33 33 private:
34   - DmpServerInterface *server_interface_ = nullptr;
  34 + DmpServerInterface *serverInterface_ = nullptr;
35 35 };
36 36
37 37 typedef std::map<int, DmpServerFilter *> DmpServerFiltersMap;
... ...
... ... @@ -11,9 +11,9 @@
11 11 DmpServerInterface::DmpServerInterface()
12 12 {
13 13 }
14   -void DmpServerInterface::SetFilters(DmpServerFiltersMap *filters)
  14 +void DmpServerInterface::setFilters(DmpServerFiltersMap *filters)
15 15 {
16 16 }
17   -void DmpServerInterface::SetRequestHandler( DmpRequestHandler *requestHandler )
  17 +void DmpServerInterface::setRequestHandler( DmpRequestHandler *requestHandler )
18 18 {
19 19 }
\ No newline at end of file
... ...
... ... @@ -23,15 +23,15 @@ public:
23 23
24 24 virtual ~DmpServerInterface() = default;
25 25
26   - virtual DmpRequestHandler *RequestHandler() = 0;
  26 + virtual DmpRequestHandler *requestHandler() = 0;
27 27
28   - virtual void SetRequestHandler(DmpRequestHandler *requestHandler);
  28 + virtual void setRequestHandler(DmpRequestHandler *requestHandler);
29 29
30   - virtual void SetFilters(DmpServerFiltersMap *filters) ;
  30 + virtual void setFilters(DmpServerFiltersMap *filters) ;
31 31
32   - virtual void RegisterFilter( DmpServerFilter *filter, int priority = 0 ) = 0;
  32 + virtual void registerFilter( DmpServerFilter *filter, int priority = 0 ) = 0;
33 33
34   - virtual DmpServerFiltersMap Filters(){ return filters_;}
  34 + virtual DmpServerFiltersMap filters(){ return filters_;}
35 35
36 36 protected:
37 37
... ...
... ... @@ -10,7 +10,7 @@
10 10
11 11 DmpServerInterfaceImpl::DmpServerInterfaceImpl()
12 12 {
13   - request_handler_ = nullptr;
  13 + requestHandler_ = nullptr;
14 14 // #ifdef HAVE_SERVER_PYTHON_PLUGINS
15 15 // mAccessControls = new QgsAccessControl();
16 16 // mCacheManager = new QgsServerCacheManager();
... ... @@ -25,17 +25,17 @@ DmpServerInterfaceImpl::~DmpServerInterfaceImpl()
25 25 // #endif
26 26 }
27 27
28   -void DmpServerInterfaceImpl::SetRequestHandler(DmpRequestHandler *request_handler)
  28 +void DmpServerInterfaceImpl::setRequestHandler(DmpRequestHandler *requestHandler)
29 29 {
30   - request_handler_ = request_handler;
  30 + requestHandler_ = requestHandler;
31 31 }
32 32
33   -void DmpServerInterfaceImpl::RegisterFilter(DmpServerFilter *filter, int priority)
  33 +void DmpServerInterfaceImpl::registerFilter(DmpServerFilter *filter, int priority)
34 34 {
35 35 filters_[priority] = filter;
36 36 }
37 37
38   -void DmpServerInterfaceImpl::SetFilters(DmpServerFiltersMap *filters)
  38 +void DmpServerInterfaceImpl::setFilters(DmpServerFiltersMap *filters)
39 39 {
40 40 filters_ = *filters;
41 41 }
\ No newline at end of file
... ...
... ... @@ -19,16 +19,15 @@ class SERVER_EXPORT DmpServerInterfaceImpl : public DmpServerInterface
19 19 public:
20 20
21 21 DmpServerInterfaceImpl();
22   - // DmpServerInterfaceImpl();
23 22 ~DmpServerInterfaceImpl() override;
24 23
25   - DmpRequestHandler *RequestHandler() override { return request_handler_; }
26   - void SetRequestHandler( DmpRequestHandler *request_handler ) override;
27   - void RegisterFilter(DmpServerFilter *filter, int priority = 0 ) override;
28   - void SetFilters( DmpServerFiltersMap *filters ) override;
  24 + DmpRequestHandler *requestHandler() override { return requestHandler_; }
  25 + void setRequestHandler( DmpRequestHandler *requestHandler ) override;
  26 + void registerFilter(DmpServerFilter *filter, int priority = 0 ) override;
  27 + void setFilters( DmpServerFiltersMap *filters ) override;
29 28
30 29 private:
31   - DmpRequestHandler *request_handler_ = nullptr;
  30 + DmpRequestHandler *requestHandler_ = nullptr;
32 31 };
33 32
34 33 #endif //__dmpserverinterfaceimpl_h__
... ...
... ... @@ -141,27 +141,27 @@ struct DmpServerResponseWrap : DmpServerResponse, wrapper<DmpServerResponse>
141 141
142 142 struct DmpServerFilterWrap : DmpServerFilter, wrapper<DmpServerFilter>
143 143 {
144   - DmpServerFilterWrap(DmpServerInterface *server_interface)
145   - : DmpServerFilter(server_interface)
  144 + DmpServerFilterWrap(DmpServerInterface *serverInterface)
  145 + : DmpServerFilter(serverInterface)
146 146 {
147 147 }
148 148
149   - void RequestReady()
  149 + void requestReady()
150 150 {
151 151 this->get_override("request_ready")();
152 152 }
153 153
154   - void RequestReadyDefault()
  154 + void requestReadyDefault()
155 155 {
156   - return this->DmpServerFilter::RequestReady();
  156 + return this->DmpServerFilter::requestReady();
157 157 }
158 158
159   - void ResponseComplete()
  159 + void responseComplete()
160 160 {
161 161 this->get_override("response_complete")();
162 162 }
163 163
164   - void SendResponse()
  164 + void sendResponse()
165 165 {
166 166 this->get_override("send_response")();
167 167 }
... ... @@ -169,18 +169,18 @@ struct DmpServerFilterWrap : DmpServerFilter, wrapper<DmpServerFilter>
169 169
170 170 struct DmpServerInterfaceWrap : DmpServerInterface, wrapper<DmpServerInterface>
171 171 {
172   - virtual DmpRequestHandler *RequestHandler()
  172 + virtual DmpRequestHandler *requestHandler()
173 173 {
174 174 return this->get_override("request_handler")();
175 175 }
176   - virtual void RegisterFilter(DmpServerFilter *filter, int priority = 0)
  176 + virtual void registerFilter(DmpServerFilter *filter, int priority = 0)
177 177 {
178 178 this->get_override("register_filter")();
179 179 }
180   - virtual DmpServerManager *ServerManager()
181   - {
182   - return this->get_override("server_manager")();
183   - }
  180 + // virtual DmpServerManager *ServerManager()
  181 + // {
  182 + // return this->get_override("server_manager")();
  183 + // }
184 184 };
185 185
186 186 BOOST_PYTHON_MODULE(dmap_server)
... ... @@ -220,12 +220,12 @@ BOOST_PYTHON_MODULE(dmap_server)
220 220 .def("append_body", &DmpRequestHandler::AppendBody);
221 221
222 222 class_<DmpServerFilterWrap, boost::noncopyable>("DmpServerFilter",init<DmpServerInterface*>())
223   - .def("request_ready", &DmpServerFilterWrap::RequestReady, &DmpServerFilterWrap::RequestReadyDefault)
224   - .def("response_complete", &DmpServerFilterWrap::ResponseComplete)
225   - .def("send_response", &DmpServerFilterWrap::SendResponse)
226   - .def("server_interface", &DmpServerFilterWrap::server_interface, return_internal_reference<>());
  223 + .def("request_ready", &DmpServerFilterWrap::requestReady, &DmpServerFilterWrap::requestReadyDefault)
  224 + .def("response_complete", &DmpServerFilterWrap::responseComplete)
  225 + .def("send_response", &DmpServerFilterWrap::sendResponse)
  226 + .def("server_interface", &DmpServerFilterWrap::serverInterface, return_internal_reference<>());
227 227
228 228 class_<DmpServerInterfaceWrap, boost::noncopyable>("DmpServerInterface")
229   - .def("register_filter", pure_virtual(&DmpServerInterface::RegisterFilter))
230   - .def("request_handler", pure_virtual(&DmpServerInterface::RequestHandler), return_internal_reference<>());
  229 + .def("register_filter", pure_virtual(&DmpServerInterface::registerFilter))
  230 + .def("request_handler", pure_virtual(&DmpServerInterface::requestHandler), return_internal_reference<>());
231 231 }
\ No newline at end of file
... ...
注册登录 后发表评论