AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed unused disconnectFromHost() from ServerController

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-04-02 15:19:59 +03:00
parent 51d7cdfd31
commit af5b9172ef
5 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/core/servercontroller.cpp
View file

@ -839,12 +839,6 @@ void ServerController::setCancelInstallation(const bool cancel)
m_cancelInstallation = 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) ErrorCode ServerController::setupServerFirewall(const ServerCredentials &credentials)
{ {
return runScript(credentials, return runScript(credentials,

1
client/core/servercontroller.h
View file

@ -31,7 +31,6 @@ public:
ErrorCode fromSshProcessExitStatus(int exitStatus); ErrorCode fromSshProcessExitStatus(int exitStatus);
QSsh::SshConnectionParameters sshParams(const ServerCredentials &credentials); QSsh::SshConnectionParameters sshParams(const ServerCredentials &credentials);
void disconnectFromHost(const ServerCredentials &credentials);
ErrorCode removeAllContainers(const ServerCredentials &credentials); ErrorCode removeAllContainers(const ServerCredentials &credentials);
ErrorCode removeContainer(const ServerCredentials &credentials, DockerContainer container); ErrorCode removeContainer(const ServerCredentials &credentials, DockerContainer container);

1
client/ui/pages_logic/AdvancedServerSettingsLogic.cpp
View file

@ -45,7 +45,6 @@ void AdvancedServerSettingsLogic::onPushButtonClearServerClicked()
} }
ErrorCode e = m_serverController->removeAllContainers(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex)); ErrorCode e = m_serverController->removeAllContainers(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
m_serverController->disconnectFromHost(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
if (e) { if (e) {
emit uiLogic()->showWarningMessage(tr("Error occurred while cleaning the server.") + "\n" + emit uiLogic()->showWarningMessage(tr("Error occurred while cleaning the server.") + "\n" +
tr("Error message: ") + errorString(e) + "\n" + tr("Error message: ") + errorString(e) + "\n" +

3
client/ui/uilogic.cpp
View file

@ -342,8 +342,6 @@ void UiLogic::installServer(QPair<DockerContainer, QJsonObject> &container)
errorCode = pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc, errorCode = pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc,
noButton, waitInfoFunc, noButton, waitInfoFunc,
busyInfoFunc, cancelButtonFunc); busyInfoFunc, cancelButtonFunc);
m_serverController->disconnectFromHost(m_installCredentials);
if (errorCode == ErrorCode::NoError) { if (errorCode == ErrorCode::NoError) {
if (!isServerCreated) { if (!isServerCreated) {
QJsonObject server; QJsonObject server;
@ -534,7 +532,6 @@ ErrorCode UiLogic::addAlreadyInstalledContainersGui(bool createNewServer, bool &
QMap<DockerContainer, QJsonObject> installedContainers; QMap<DockerContainer, QJsonObject> installedContainers;
ErrorCode errorCode = m_serverController->getAlreadyInstalledContainers(credentials, installedContainers); ErrorCode errorCode = m_serverController->getAlreadyInstalledContainers(credentials, installedContainers);
m_serverController->disconnectFromHost(credentials);
if (errorCode != ErrorCode::NoError) { if (errorCode != ErrorCode::NoError) {
return errorCode; return errorCode;
} }

2
client/vpnconnection.cpp
View file

@ -372,8 +372,6 @@ void VpnConnection::connectToVpn(int serverIndex,
createProtocolConnections(); createProtocolConnections();
m_serverController->disconnectFromHost(credentials);
e = m_vpnProtocol.data()->start(); e = m_vpnProtocol.data()->start();
if (e) emit VpnProtocol::Error; if (e) emit VpnProtocol::Error;
} }