Added the permission mapping file

This commit is contained in:
WolverinDEV
2019-08-25 23:55:55 +02:00
parent bd43c53db2
commit 87fd26301d
12 changed files with 370 additions and 28 deletions
+8 -1
View File
@@ -12,6 +12,7 @@
#include "src/server/QueryServer.h"
#include "src/server/file/FileServer.h"
#include "SignalHandler.h"
#include "src/manager/PermissionNameMapper.h"
#include <ThreadPool/Timer.h>
#include "ShutdownHelper.h"
#include <sys/utsname.h>
@@ -228,8 +229,15 @@ inline sockaddr_in* resolveAddress(const string& host, uint16_t port) {
bool InstanceHandler::startInstance() {
if (this->active) return false;
active = true;
string errorMessage;
this->web_list->enabled = ts::config::server::enable_teamspeak_weblist;
this->permission_mapper = make_shared<permission::PermissionNameMapper>();
if(!this->permission_mapper->initialize(config::permission_mapping_file, errorMessage)) {
logCritical(LOG_INSTANCE, "Failed to initialize permission name mapping from file {}: {}", config::permission_mapping_file, errorMessage);
return false;
}
this->sslMgr = new ssl::SSLManager();
if(!this->sslMgr->initialize()) {
logCritical("Failed to initialize ssl manager.");
@@ -264,7 +272,6 @@ bool InstanceHandler::startInstance() {
}
}
string errorMessage;
queryServer = new ts::server::QueryServer(this->getSql());
{
auto server_query = queryServer->find_query_account_by_name("serveradmin");