merge last integrate-mtproxy

This commit is contained in:
dranik
2026-05-18 14:27:14 +03:00
3 changed files with 2 additions and 1 deletions
@@ -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);