A lot of query reworking

server/src/VirtualServerManager.cpp

@@ -15,7 +15,6 @@ using namespace ts::server;
 VirtualServerManager::VirtualServerManager(InstanceHandler* handle) : handle(handle) {
     this->puzzles = new udp::PuzzleManager{};
     this->handshakeTickers = new threads::Scheduler(1, "handshake ticker");
-    this->execute_loop = new event::EventExecutor("executor #");
     //this->join_loop = new event::EventExecutor("joiner #");
     this->_ioManager = new io::VoiceIOManager();
 
@@ -40,11 +39,6 @@ VirtualServerManager::~VirtualServerManager() {
     delete this->puzzles;
     this->puzzles = nullptr;
 
-    if(this->execute_loop)
-        this->execute_loop->shutdown();
-    delete this->execute_loop;
-    this->execute_loop = nullptr;
-
     if(this->join_loop)
         this->join_loop->shutdown();
     delete this->join_loop;
@@ -62,8 +56,6 @@ VirtualServerManager::~VirtualServerManager() {
 }
 
 bool VirtualServerManager::initialize(bool autostart) {
-    this->execute_loop->initialize(1);
-
     this->state = State::STARTING;
     logMessage(LOG_INSTANCE, "Generating server puzzles...");
     auto start = system_clock::now();
@@ -162,7 +154,6 @@ bool VirtualServerManager::initialize(bool autostart) {
              (float) server_count / (time / 1024 == 0 ? 1 : time / 1024)
     );
     this->handle->databaseHelper()->clearStartupCache(0);
-    this->adjust_executor_threads();
 
     {
         this->acknowledge.executor = std::thread([&]{
@@ -370,7 +361,6 @@ shared_ptr<VirtualServer> VirtualServerManager::create_server(std::string hosts,
         threads::MutexLock l(this->instanceLock);
         this->instances.push_back(server);
     }
-    this->adjust_executor_threads();
     return server;
 }
 
@@ -388,7 +378,6 @@ bool VirtualServerManager::deleteServer(shared_ptr<VirtualServer> server) {
             return s == server;
         }), this->instances.end());
     }
-    this->adjust_executor_threads();
 
     if(server->getState() != ServerState::OFFLINE)
         server->stop("server deleted", true);
@@ -397,7 +386,7 @@ bool VirtualServerManager::deleteServer(shared_ptr<VirtualServer> server) {
             cl->close_connection(chrono::system_clock::now());
         } else if(cl->getType() == CLIENT_QUERY){
             auto qc = dynamic_pointer_cast<QueryClient>(cl);
-            qc->disconnect_from_virtual_server();
+            qc->disconnect_from_virtual_server("server delete");
         } else if(cl->getType() == CLIENT_MUSIC) {
             cl->disconnect("");
             cl->currentChannel = nullptr;
@@ -473,8 +462,6 @@ void VirtualServerManager::shutdownAll(const std::string& msg) {
     for(const auto &server : this->serverInstances()){
         if(server->running()) server->stop(msg, true);
     }
-
-    this->execute_loop->shutdown();
 }
 
 void VirtualServerManager::tickHandshakeClients() {