Merge pull request #517 from subutai-io/dev

Dev
subutai-io · Jan 4, 2018 · 2de8117 · 2de8117
2 parents 99981aa + d2b43ad
commit 2de8117
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,7 +4,7 @@ notifyBuildDetails = ""
 
 try {
 	notifyBuild('STARTED')
-    switch (env.BRANCH_NAME) {
+	switch (env.BRANCH_NAME) {
             case ~/master/: 
             upload_path = "C:\\Jenkins\\upload\\master\\"
             windows_tray_build = "build_master.lnk"
@@ -22,7 +22,7 @@ try {
             upload_osx = "SubutaiTray_osx"
 
             break;
-	          default: 
+	    default: 
             upload_path = "C:\\Jenkins\\upload\\dev\\"
             windows_tray_build = "build_dev.lnk"
             upload_msi = "upload_dev_msi.do"
@@ -41,14 +41,14 @@ try {
 	/* Building agent binary.
 	Node block used to separate agent and subos code.
 	*/
-  node("mac") {
+        node("mac") {
 
 		stage("Start build macOS")
 
 		notifyBuildDetails = "\nFailed on Stage - Start build"
 
 		sh """
-			/User/dev/SRC/tray/./build_mac.sh /Users/dev/Qt5.9.2/5.9.2/clang_64/bin/ ${build_mac} /Users/dev/SRC/tray/
+		/Users/dev/SRC/TrayDevops/tray/osx/./build_mac.sh /Users/dev/Qt5.9.2/5.9.2/clang_64/bin/ ${build_mac} /Users/dev/SRC/tray/
 		"""
 
 		stage("Upload")
@@ -70,7 +70,7 @@ try {
 
 		bat "C:\\Jenkins\\build\\${windows_tray_build}"
 
-    stage("Upload")
+		stage("Upload")
 
 		notifyBuildDetails = "\nFailed on Stage - Upload"
 
@@ -85,7 +85,7 @@ try {
 		notifyBuildDetails = "\nFailed on Stage - Start build"
 
 		sh """
-			/home/builder/./${linux_tray_build}
+		/home/builder/./${linux_tray_build}
 		"""
 
 		stage("Upload")
@@ -96,7 +96,6 @@ try {
 		/home/builder/upload_script/./${upload_script} /${build_path_linux}/${upload_deb}
 		/home/builder/upload_script/./${upload_script} /${build_path_linux}/${upload_sh}
 		"""
-
 	}
 
 } catch (e) { 

diff --git a/hub/include/P2PController.h b/hub/include/P2PController.h
@@ -70,7 +70,6 @@ class P2PController : public QObject
 
 public:
  P2PController();
- ~P2PController();
 
  bool join_swarm_success(QString swarm_hash);
  bool handshake_success(QString env_id, QString cont_id);

diff --git a/hub/src/P2PController.cpp b/hub/src/P2PController.cpp
@@ -114,26 +114,6 @@ P2PController::P2PController() {
   m_join_to_swarm_timer->start(1000 * 60 * 3); // 3 minutes
   QTimer::singleShot(10000, this, &P2PController::update_join_swarm_status); // 10 sec
 }
-/////////////////////////////////////////////////////////////////////////
-
-P2PController::~P2PController() {
-  qDebug() << "P2PController destructor";
-  if (!envs_joined_swarm_hash.empty() && CSystemCallWrapper::p2p_daemon_check()) {
-    for (auto env_hash : envs_joined_swarm_hash) {
-      system_call_wrapper_error_t res = CSystemCallWrapper::leave_p2p_swarm(env_hash);
-      if (res == SCWE_SUCCESS) {
-        qInfo() << QString("Left the swarm [swarm_hash: %1]")
-                    .arg(env_hash);
-      }
-      else {
-        qCritical() << QString("Can't leave the swarm [swarm_hash: %1]. Error message %2")
-                       .arg(env_hash)
-                       .arg(CSystemCallWrapper::scwe_error_to_str(res).toStdString().c_str());
-      }
-    }
-  }
-  envs_joined_swarm_hash.clear();
-}
 
 /////////////////////////////////////////////////////////////////////////