From af5b9172ef0d328ea7bf80b11f293d5d874d0434 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 2 Apr 2023 15:19:59 +0300 Subject: [PATCH] removed unused disconnectFromHost() from ServerController --- client/core/servercontroller.cpp | 6 ------ client/core/servercontroller.h | 1 - client/ui/pages_logic/AdvancedServerSettingsLogic.cpp | 1 - client/ui/uilogic.cpp | 3 --- client/vpnconnection.cpp | 2 -- 5 files changed, 13 deletions(-) diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp index 132cb18c..67a21bba 100644 --- a/client/core/servercontroller.cpp +++ b/client/core/servercontroller.cpp @@ -839,12 +839,6 @@ void ServerController::setCancelInstallation(const bool cancel) m_cancelInstallation = cancel; } -void ServerController::disconnectFromHost(const ServerCredentials &credentials) -{ -// SshConnection *client = acquireConnection(sshParams(credentials)); -// if (client) client->disconnectFromHost(); -} - ErrorCode ServerController::setupServerFirewall(const ServerCredentials &credentials) { return runScript(credentials, diff --git a/client/core/servercontroller.h b/client/core/servercontroller.h index b13f3ebf..68d47417 100644 --- a/client/core/servercontroller.h +++ b/client/core/servercontroller.h @@ -31,7 +31,6 @@ public: ErrorCode fromSshProcessExitStatus(int exitStatus); QSsh::SshConnectionParameters sshParams(const ServerCredentials &credentials); - void disconnectFromHost(const ServerCredentials &credentials); ErrorCode removeAllContainers(const ServerCredentials &credentials); ErrorCode removeContainer(const ServerCredentials &credentials, DockerContainer container); diff --git a/client/ui/pages_logic/AdvancedServerSettingsLogic.cpp b/client/ui/pages_logic/AdvancedServerSettingsLogic.cpp index 0b02241c..187af9ee 100644 --- a/client/ui/pages_logic/AdvancedServerSettingsLogic.cpp +++ b/client/ui/pages_logic/AdvancedServerSettingsLogic.cpp @@ -45,7 +45,6 @@ void AdvancedServerSettingsLogic::onPushButtonClearServerClicked() } ErrorCode e = m_serverController->removeAllContainers(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex)); - m_serverController->disconnectFromHost(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex)); if (e) { emit uiLogic()->showWarningMessage(tr("Error occurred while cleaning the server.") + "\n" + tr("Error message: ") + errorString(e) + "\n" + diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp index cdfd1833..3dbd7b86 100644 --- a/client/ui/uilogic.cpp +++ b/client/ui/uilogic.cpp @@ -342,8 +342,6 @@ void UiLogic::installServer(QPair &container) errorCode = pageLogic()->doInstallAction(installAction, pageFunc, progressBarFunc, noButton, waitInfoFunc, busyInfoFunc, cancelButtonFunc); - m_serverController->disconnectFromHost(m_installCredentials); - if (errorCode == ErrorCode::NoError) { if (!isServerCreated) { QJsonObject server; @@ -534,7 +532,6 @@ ErrorCode UiLogic::addAlreadyInstalledContainersGui(bool createNewServer, bool & QMap installedContainers; ErrorCode errorCode = m_serverController->getAlreadyInstalledContainers(credentials, installedContainers); - m_serverController->disconnectFromHost(credentials); if (errorCode != ErrorCode::NoError) { return errorCode; } diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp index 6d8aa493..21643ae5 100644 --- a/client/vpnconnection.cpp +++ b/client/vpnconnection.cpp @@ -372,8 +372,6 @@ void VpnConnection::connectToVpn(int serverIndex, createProtocolConnections(); - m_serverController->disconnectFromHost(credentials); - e = m_vpnProtocol.data()->start(); if (e) emit VpnProtocol::Error; }