Commit f227c0f2 authored by Carla Guillen Carias's avatar Carla Guillen Carias
Browse files

Merge branch 'development' of https://gitlab.lrz.de/dcdb/dcdb into development

parents 1e4aa6c1 069f3cb2
...@@ -559,7 +559,7 @@ int main(int argc, char* const argv[]) { ...@@ -559,7 +559,7 @@ int main(int argc, char* const argv[]) {
/* /*
* Start the HTTP Server for the REST API * Start the HTTP Server for the REST API
*/ */
CARestAPI* httpsServer; CARestAPI* httpsServer = nullptr;
if (restAPISettings.enabled) { if (restAPISettings.enabled) {
httpsServer = new CARestAPI(restAPISettings, &mySensorCache, analyticsController); httpsServer = new CARestAPI(restAPISettings, &mySensorCache, analyticsController);
config.readRestAPIUsers(httpsServer); config.readRestAPIUsers(httpsServer);
......
...@@ -4,8 +4,7 @@ CXXFLAGS += -DBOOST_NETWORK_ENABLE_HTTPS \ ...@@ -4,8 +4,7 @@ CXXFLAGS += -DBOOST_NETWORK_ENABLE_HTTPS \
-I../common/include \ -I../common/include \
-I$(DCDBDEPLOYPATH)/include -I$(DCDBDEPLOYPATH)/include
LIBS = -L../lib \ LIBS = -L$(DCDBDEPLOYPATH)/lib/ \
-L$(DCDBDEPLOYPATH)/lib/ \
-ldl \ -ldl \
-lmosquitto \ -lmosquitto \
-lboost_system \ -lboost_system \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment