From 11b98095c1a5b2d468501e290799a2bebb21577b Mon Sep 17 00:00:00 2001 From: erkin97 Date: Fri, 2 Mar 2018 14:26:34 +0600 Subject: [PATCH 1/3] no ssh key error --- hub/include/HubController.h | 1 + hub/src/HubController.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hub/include/HubController.h b/hub/include/HubController.h index 87f1a39a..8178fe5c 100644 --- a/hub/include/HubController.h +++ b/hub/include/HubController.h @@ -20,6 +20,7 @@ typedef enum ssh_desktop_launch_error { SDLE_CONT_NOT_READY, SDLE_JOIN_TO_SWARM_FAILED, SDLE_SYSTEM_CALL_FAILED, + SDLE_NO_KEY_DEPLOYED, SDLE_LAST_ERR } ssh_desktop_launch_error_t; diff --git a/hub/src/HubController.cpp b/hub/src/HubController.cpp index 027a9b1d..b9e0307c 100644 --- a/hub/src/HubController.cpp +++ b/hub/src/HubController.cpp @@ -355,6 +355,9 @@ ssh_desktop_launch_error_t CHubController::ssh_to_container_internal(const CEnvi if (container_status != SDLE_SUCCESS) { return container_status; } + if(key.isEmpty()){ + return SDLE_NO_KEY_DEPLOYED; + } system_call_wrapper_error_t run_in_terminal_status = ssh_to_container_in_terminal(cont, key); if (run_in_terminal_status != SCWE_SUCCESS) { QString err_msg = tr("Run SSH failed. Error code : %1") @@ -480,8 +483,9 @@ const QString &CHubController::ssh_desktop_launch_err_to_str(int err) { "Container not found", "Container isn't ready", "Join to p2p swarm failed", - "System call failed"}; - return lst_err_str[err % SDLE_LAST_ERR]; + "System call failed", + "No key deployed"}; + return lst_err_str[err % SDLE_LAST_ERR]; } const QString CHubController::get_env_key(const QString &env_id) { From a4b343036044145a637f75f47535611a947bd2cf Mon Sep 17 00:00:00 2001 From: erkin97 Date: Sat, 3 Mar 2018 15:18:47 +0600 Subject: [PATCH 2/3] remove owner=jenkins --- commons/src/OsBranchConsts.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commons/src/OsBranchConsts.cpp b/commons/src/OsBranchConsts.cpp index ca236e47..56869ee9 100644 --- a/commons/src/OsBranchConsts.cpp +++ b/commons/src/OsBranchConsts.cpp @@ -168,9 +168,9 @@ template const QString& hub_kurjun_url_temp_internal(); return res; \ } -hub_kurjun_url_temp_internal_def(BT_PROD, "https://cdn.subutai.io:8338/kurjun/rest/%1&owner=jenkins") -hub_kurjun_url_temp_internal_def(BT_MASTER, "https://mastercdn.subutai.io:8338/kurjun/rest/%1&owner=jenkins") -hub_kurjun_url_temp_internal_def(BT_DEV, "https://devcdn.subutai.io:8338/kurjun/rest/%1&owner=jenkins") +hub_kurjun_url_temp_internal_def(BT_PROD, "https://cdn.subutai.io:8338/kurjun/rest/%1") +hub_kurjun_url_temp_internal_def(BT_MASTER, "https://mastercdn.subutai.io:8338/kurjun/rest/%1") +hub_kurjun_url_temp_internal_def(BT_DEV, "https://devcdn.subutai.io:8338/kurjun/rest/%1") const QString & hub_gorjun_url() { From d1e8e42ac7250333e65ce5b7ed28a9cdf94e24ac Mon Sep 17 00:00:00 2001 From: erkin97 Date: Sat, 3 Mar 2018 15:32:47 +0600 Subject: [PATCH 3/3] rename language fiels #681 --- SubutaiControlCenter.pro | 6 +++--- SubutaiTray_en_US.ts => SubutaiControlCenter_en_US.ts | 0 SubutaiTray_pt_BR.ts => SubutaiControlCenter_pt_BR.ts | 0 SubutaiTray_ru_RU.ts => SubutaiControlCenter_ru_RU.ts | 0 main.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename SubutaiTray_en_US.ts => SubutaiControlCenter_en_US.ts (100%) rename SubutaiTray_pt_BR.ts => SubutaiControlCenter_pt_BR.ts (100%) rename SubutaiTray_ru_RU.ts => SubutaiControlCenter_ru_RU.ts (100%) diff --git a/SubutaiControlCenter.pro b/SubutaiControlCenter.pro index c8f5d07b..50e13ffd 100644 --- a/SubutaiControlCenter.pro +++ b/SubutaiControlCenter.pro @@ -108,9 +108,9 @@ HEADERS += \ hub/include/HostMachineController.h \ hub/forms/DlgTransferFile.h -TRANSLATIONS = SubutaiTray_en_US.ts \ - SubutaiTray_ru_RU.ts \ - SubutaiTray_pt_BR.ts +TRANSLATIONS = SubutaiControlCenter_en_US.ts \ + SubutaiControlCenter_ru_RU.ts \ + SubutaiControlCenter_pt_BR.ts FORMS += \ hub/forms/DlgLogin.ui \ diff --git a/SubutaiTray_en_US.ts b/SubutaiControlCenter_en_US.ts similarity index 100% rename from SubutaiTray_en_US.ts rename to SubutaiControlCenter_en_US.ts diff --git a/SubutaiTray_pt_BR.ts b/SubutaiControlCenter_pt_BR.ts similarity index 100% rename from SubutaiTray_pt_BR.ts rename to SubutaiControlCenter_pt_BR.ts diff --git a/SubutaiTray_ru_RU.ts b/SubutaiControlCenter_ru_RU.ts similarity index 100% rename from SubutaiTray_ru_RU.ts rename to SubutaiControlCenter_ru_RU.ts diff --git a/main.cpp b/main.cpp index 9bb17640..d62b96b6 100644 --- a/main.cpp +++ b/main.cpp @@ -71,7 +71,7 @@ main(int argc, char *argv[]) { QTranslator translator; QString locale = LanguageController::CurrentLocale(); - translator.load(QString("SubutaiTray_%1.qm").arg(locale), QApplication::applicationDirPath()); + translator.load(QString("SubutaiControlCenter_%1.qm").arg(locale), QApplication::applicationDirPath()); app.installTranslator(&translator); qInstallMessageHandler(Logger::LoggerMessageOutput);