Merge pull request #686 from subutai-io/dev

Dev
subutai-io · Mar 3, 2018 · 44d86cc · 44d86cc
2 parents 7c11780 + 07c47e2
commit 44d86cc
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git 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 → SubutaiControlCenter_en_US.ts b/SubutaiTray_en_US.ts → SubutaiControlCenter_en_US.ts
diff --git a/SubutaiTray_pt_BR.ts → SubutaiControlCenter_pt_BR.ts b/SubutaiTray_pt_BR.ts → SubutaiControlCenter_pt_BR.ts
diff --git a/SubutaiTray_ru_RU.ts → SubutaiControlCenter_ru_RU.ts b/SubutaiTray_ru_RU.ts → SubutaiControlCenter_ru_RU.ts
diff --git a/commons/src/OsBranchConsts.cpp b/commons/src/OsBranchConsts.cpp
@@ -168,9 +168,9 @@ template<class BR> 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() {

diff --git 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
@@ -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) {

diff --git 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);