aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qlicenseservice/licenser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/qlicenseservice/licenser.cpp')
-rw-r--r--src/libs/qlicenseservice/licenser.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libs/qlicenseservice/licenser.cpp b/src/libs/qlicenseservice/licenser.cpp
index 9094bd7..df85f4e 100644
--- a/src/libs/qlicenseservice/licenser.cpp
+++ b/src/libs/qlicenseservice/licenser.cpp
@@ -31,10 +31,7 @@ Licenser::Licenser(uint16_t tcpPort, const std::string &settingsPath)
}
m_mocInterval = utils::strToInt(m_settings->get("moc_renewal_interval")) * SECS_IN_HOUR;
// Start the HTTP client
- m_http = new HttpClient(m_settings->get("server_addr"),
- m_settings->get("reservation_access_point"),
- m_settings->get("permanent_access_point"),
- m_settings->get("version_query_access_point"));
+ m_http = new HttpClient(m_settings->get("server_addr"));
// Start the TCP/IP server
m_tcpServer = new TcpServer(tcpPort);
if (!m_tcpServer->init()) {
@@ -149,7 +146,6 @@ int Licenser::listen()
if (m_floatingClients.size() > 0) {
checkTasksDue();
}
- std::cout << "Current clients in cache: " << m_floatingClients.size() << std::endl;
return 0;
}
@@ -214,7 +210,6 @@ ClientHandler *Licenser::parseInputAndCreateCLient(uint16_t socketId, const std:
int Licenser::sendServerRequest(const RequestInfo &request, std::string &reply)
{
std::string auth;
- std::cout << "Payload: " << request.payload << std::endl;
// Generate auth hash for HTTP headers
std::string hash;
@@ -223,7 +218,9 @@ int Licenser::sendServerRequest(const RequestInfo &request, std::string &reply)
auth = "apikey " + hash;
// Send the request
- if (m_http->sendRequest(reply, request.payload, request.serverAddr, auth) != 0) {
+ if (m_http->sendAndReceive(reply, request.payload,
+ request.accessPoint,
+ request.serverAddr, auth) != 0) {
return e_bad_connection;
}
return e_got_response;