diff options
Diffstat (limited to 'src/libs/qlicenseservice/daemon_clients/clitoolhandler.h')
| -rw-r--r-- | src/libs/qlicenseservice/daemon_clients/clitoolhandler.h | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/src/libs/qlicenseservice/daemon_clients/clitoolhandler.h b/src/libs/qlicenseservice/daemon_clients/clitoolhandler.h index ceeefc0..021d958 100644 --- a/src/libs/qlicenseservice/daemon_clients/clitoolhandler.h +++ b/src/libs/qlicenseservice/daemon_clients/clitoolhandler.h @@ -45,37 +45,33 @@ class CliToolHandler : public virtual ClientHandler { JsonHandler json(response); std::stringstream ss; - if (m_request.reqType == RequestType::long_term_request) { - // long-term request: Have "message" field from response JSON directly as a reply to the user - response = json.get("message"); - if (json.get("status") != "true" ) { - if (response == "License fully reserved") { - response = replyString[e_license_pool_full]; - } else if (response.find("cannot be early released") != std::string::npos) { - response = replyString[e_no_permanent_to_release]; - } else { - response = replyString[e_license_rejected]; - } - // Do not touch the license file, just return - return 1; - } - } else if (m_request.reqType == RequestType::server_version) { + if (m_request.reqType == RequestType::server_version) { response = "Qt License Server v"; response += json.get("version"); - return 0; // Do not touch cached license files pls. + return 0; } - ss << replyString[e_license_granted]; - ss << " expiry_date=" << json.get("expiry_date"); - ss << " license_id=" << json.get("license_number"); - ss << " reservation_id=" << json.get("reservation_id"); - response = ss.str(); - // Add timestamp into license JSON - json.add("last_timestamp", utils::getTimestampNow()); + if (json.get("status") != "true" ) { + if (response == "License fully reserved") { + response = replyString[e_license_pool_full]; + } else if (response.find("cannot be early released") != std::string::npos) { + response = replyString[e_no_permanent_to_release]; + } else { + response = replyString[e_license_rejected]; + } + // Do not touch the license file, just return + return 1; + } else if (m_request.reqType == RequestType::long_term_request) { + // long-term request: Have "message" field from response JSON directly as a reply to the user + response = json.get("message"); - int result = utils::writeToFile(m_request.licenseFile, json.dump(4)); - if (result != 0) { - std::cout << "ERROR saving license file: '" << m_request.licenseFile << "': " << strerror(result) << std::endl; + // Add timestamp into license JSON + json.add("last_timestamp", utils::getTimestampNow()); + + int result = utils::writeToFile(m_request.licenseFile, json.dump(4)); + if (result != 0) { + std::cout << "ERROR saving license file: '" << m_request.licenseFile << "': " << strerror(result) << std::endl; + } } return 0; } |