From b65f46d00af958292b416eed182331e72562f41d Mon Sep 17 00:00:00 2001 From: lunardunno <126363523+lunardunno@users.noreply.github.com> Date: Sun, 23 Mar 2025 12:50:22 +0400 Subject: [PATCH] Polishing --- client/core/controllers/serverController.cpp | 6 +++--- client/core/defs.h | 4 ++-- client/core/errorstrings.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/core/controllers/serverController.cpp b/client/core/controllers/serverController.cpp index 173e9b81..9ac62759 100644 --- a/client/core/controllers/serverController.cpp +++ b/client/core/controllers/serverController.cpp @@ -449,10 +449,10 @@ ErrorCode ServerController::buildContainerWorker(const ServerCredentials &creden replaceVars(amnezia::scriptData(SharedScriptType::build_container), genVarsForScript(credentials, container, config)), cbReadStdOut, cbReadStdErr); - if (stdOut.contains("runc doesn't work on cgroups v2")) - return ErrorCode::ServerRuncNotWorkOnCgroupsV2; + if (stdOut.contains("doesn't work on cgroups v2")) + return ErrorCode::ServerDockerOnCgroupsV2; if (stdOut.contains("cgroup mountpoint does not exist")) - return ErrorCode::ServerCgroupMountpointDoesNotExist; + return ErrorCode::ServerCgroupMountpoint; return error; } diff --git a/client/core/defs.h b/client/core/defs.h index fc1cafcf..eff3df3b 100644 --- a/client/core/defs.h +++ b/client/core/defs.h @@ -58,8 +58,8 @@ namespace amnezia ServerUserDirectoryNotAccessible = 208, ServerUserNotAllowedInSudoers = 209, ServerUserPasswordRequired = 210, - ServerRuncNotWorkOnCgroupsV2 = 211, - ServerCgroupMountpointDoesNotExist = 212, + ServerDockerOnCgroupsV2 = 211, + ServerCgroupMountpoint = 212, // Ssh connection errors SshRequestDeniedError = 300, diff --git a/client/core/errorstrings.cpp b/client/core/errorstrings.cpp index ae0bd682..66957150 100644 --- a/client/core/errorstrings.cpp +++ b/client/core/errorstrings.cpp @@ -26,8 +26,8 @@ QString errorString(ErrorCode code) { case(ErrorCode::ServerUserDirectoryNotAccessible): errorMessage = QObject::tr("The server user's home directory is not accessible"); break; case(ErrorCode::ServerUserNotAllowedInSudoers): errorMessage = QObject::tr("Action not allowed in sudoers"); break; case(ErrorCode::ServerUserPasswordRequired): errorMessage = QObject::tr("The user's password is required"); break; - case(ErrorCode::ServerRuncNotWorkOnCgroupsV2): errorMessage = QObject::tr("Docker error: Runc dosn't work on cgroups v2"); break; - case(ErrorCode::ServerCgroupMountpointDoesNotExist): errorMessage = QObject::tr("Docker error: cgroup mountpoint does not exist"); break; + case(ErrorCode::ServerDockerOnCgroupsV2): errorMessage = QObject::tr("Docker error: dosn't work on cgroups v2"); break; + case(ErrorCode::ServerCgroupMountpoint): errorMessage = QObject::tr("Server error: cgroup mountpoint does not exist"); break; // Libssh errors case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("SSH request was denied"); break;