andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

merge last integrate-mtproxy

Browse Source
This commit is contained in:
dranik
2026-05-18 14:27:14 +03:00
parent 72196484a7 05ce813c23
commit 39e4c52fb3
3 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/core/controllers/selfhosted/installController.cpp
+1
View File
@@ -1514,6 +1514,7 @@ ErrorCode InstallController::queryDockerContainerStatus(const QString &serverId,
ErrorCode InstallController::queryMtProxyDiagnostics(const QString &serverId, DockerContainer container, int listenPort, ErrorCode InstallController::queryMtProxyDiagnostics(const QString &serverId, DockerContainer container, int listenPort,
MtProxyContainerDiagnostics &out) MtProxyContainerDiagnostics &out)
{ {
out = {};
auto adminConfig = m_serversRepository->selfHostedAdminConfig(serverId); auto adminConfig = m_serversRepository->selfHostedAdminConfig(serverId);
if (!adminConfig.has_value()) { if (!adminConfig.has_value()) {
return ErrorCode::InternalError; return ErrorCode::InternalError;
client/core/installers/mtProxyInstaller.h
-1
View File
@@ -26,7 +26,6 @@ public:
amnezia::DockerContainer container, amnezia::DockerContainer container,
const amnezia::ContainerConfig &config); 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, static amnezia::ErrorCode queryDiagnostics(SshSession &sshSession, const amnezia::ServerCredentials &credentials,
amnezia::DockerContainer container, int listenPort, amnezia::DockerContainer container, int listenPort,
MtProxyContainerDiagnostics &out); MtProxyContainerDiagnostics &out);
client/ui/controllers/selfhosted/installUiController.cpp
+1
View File
@@ -386,6 +386,7 @@ void InstallUiController::fetchContainerSecret(const QString &serverId, int cont
} }
void InstallUiController::rebootServer(const QString &serverId) void InstallUiController::rebootServer(const QString &serverId)
{
const QString serverName = m_serversController->notificationDisplayName(serverId); const QString serverName = m_serversController->notificationDisplayName(serverId);
const auto errorCode = m_installController->rebootServer(serverId); const auto errorCode = m_installController->rebootServer(serverId);