TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some license server improvements

Browse Source
This commit is contained in:
WolverinDEV
2020-02-06 13:49:39 +01:00
parent 14d9936d90
commit 3e39bcc38c
9 changed files with 322 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
license/LicenseServerMain.cpp
+9 -9
View File
@@ -117,8 +117,8 @@ int main(int argc, char** argv) {
bool db_connected = true;
((sql::mysql::MySQLManager*) database)->listener_disconnected = [&](bool wanted){
if(wanted) return;
logCritical("Lost connection to MySQL server!");
logCritical("Stopping server!");
logCritical(LOG_GENERAL, "Lost connection to MySQL server!");
logCritical(LOG_GENERAL, "Stopping server!");
db_connected = false;
};
@@ -126,7 +126,7 @@ int main(int argc, char** argv) {
logMessage(LOG_GENERAL, "Connecting to {}", argv[1]);
auto connect_result = database->connect(string(argv[1]));
if(!connect_result) {
logError("Could not connect to mysql server! (" + connect_result.fmtStr() + ")");
logError(LOG_GENERAL, "Could not connect to mysql server! (" + connect_result.fmtStr() + ")");
return 0;
}
#if false
@@ -140,7 +140,7 @@ int main(int argc, char** argv) {
license_manager = make_shared<server::LicenseManager>(database);
if(!license_manager->setup(error)) {
logError("Could not start license manager! (" +error + ")");
logError(LOG_GENERAL, "Could not start license manager! (" +error + ")");
return 0;
}
@@ -244,7 +244,7 @@ int main(int argc, char** argv) {
{
web_server = make_shared<license::web::WebStatistics>(license_manager, statistic_manager);
logMessage("Starting web server on [:::]:27788");
logMessage(LOG_GENERAL, "Starting web server on [:::]:27788");
if(!web_server->start(error, 27788, ssl_manager->getContext("web_stats"))) {
logError(LOG_GENERAL, "Failed to start web statistics server!");
return 0;
@@ -255,7 +255,7 @@ int main(int argc, char** argv) {
user_manager = make_shared<UserManager>(database);
}
{
logMessage("Starting license server on [:::]:27786");
logMessage(LOG_GENERAL, "Starting license server on [:::]:27786");
struct sockaddr_in listen_addr{};
memset(&listen_addr, 0, sizeof(listen_addr));
listen_addr.sin_family = AF_INET;
@@ -264,7 +264,7 @@ int main(int argc, char** argv) {
license_server = make_shared<LicenseServer>(listen_addr, license_manager, statistic_manager, web_server, user_manager);
license_server->web_certificate = load_web_certificate();
license_server->startServer();
license_server->start();
}
while(db_connected && web_server->running() && license_server->isRunning()) {
@@ -280,7 +280,7 @@ int main(int argc, char** argv) {
}
web_server->stop();
license_server->stopServer();
license_server->stop();
if(database) database->disconnect();
logger::uninstall();
@@ -299,6 +299,6 @@ bool handle_command(string& line) {
logMessage(LOG_LICENSE_WEB, " {} clients are currently connected!", clients.size());
return true;
}
logError("Invalid command: " + line);
logError(LOG_GENERAL, "Invalid command: " + line);
return true;
}