mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-20 02:00:55 +07:00
merge last integrate-mtproxy
This commit is contained in:
@@ -1514,6 +1514,7 @@ ErrorCode InstallController::queryDockerContainerStatus(const QString &serverId,
|
||||
ErrorCode InstallController::queryMtProxyDiagnostics(const QString &serverId, DockerContainer container, int listenPort,
|
||||
MtProxyContainerDiagnostics &out)
|
||||
{
|
||||
out = {};
|
||||
auto adminConfig = m_serversRepository->selfHostedAdminConfig(serverId);
|
||||
if (!adminConfig.has_value()) {
|
||||
return ErrorCode::InternalError;
|
||||
|
||||
@@ -26,7 +26,6 @@ public:
|
||||
amnezia::DockerContainer container,
|
||||
const amnezia::ContainerConfig &config);
|
||||
|
||||
/// Shared diagnostics shell for MtProxy and Telemt service containers (legacy script paths).
|
||||
static amnezia::ErrorCode queryDiagnostics(SshSession &sshSession, const amnezia::ServerCredentials &credentials,
|
||||
amnezia::DockerContainer container, int listenPort,
|
||||
MtProxyContainerDiagnostics &out);
|
||||
|
||||
@@ -386,6 +386,7 @@ void InstallUiController::fetchContainerSecret(const QString &serverId, int cont
|
||||
}
|
||||
|
||||
void InstallUiController::rebootServer(const QString &serverId)
|
||||
{
|
||||
const QString serverName = m_serversController->notificationDisplayName(serverId);
|
||||
|
||||
const auto errorCode = m_installController->rebootServer(serverId);
|
||||
|
||||
Reference in New Issue
Block a user