From 1ea4a233810509a0b7849ca9c5d988119952ba4e Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Tue, 21 Jul 2020 18:22:41 +0200
Subject: [PATCH] Fixed a bug that prevent orborus docker network passing

---
 backend/app_sdk/app_base.py         |  2 +-
 functions/onprem/orborus/orborus.go | 28 +++++++++++++++-------------
 functions/onprem/worker/worker.go   |  7 +++++++
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index 1a311ee7..7ef5bbeb 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -101,7 +101,7 @@ class AppBase:
         except requests.exceptions.ConnectionError as e:
             print("Connectionerror: %s" %  e)
 
-            action_result["result"] = "Bad setup during startup: %d" % e 
+            action_result["result"] = "Bad setup during startup: %s" % e 
             self.send_result(action_result, headers, stream_path) 
             return
 
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index d86ba371..fbee4052 100644
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -78,10 +78,11 @@ func init() {
 	// Skip random containers. Only handle things related to Shuffle.
 	for _, container := range containers {
 		found := false
-		//log.Printf("Running? %#v", container)
-		if container.State != "running" {
-			continue
-		}
+
+		// Bad states - it might just be created sometimes, leading to now netowkr
+		//if container.State == "restarting" || container.State == "paused" || container.State == "exited" || container.State == "dead" {
+		//	continue
+		//}
 
 		for _, name := range container.Names {
 			if !strings.Contains(strings.ToLower(name), containerIdentifier) {
@@ -120,17 +121,10 @@ func deployWorker(image string, identifier string, env []string) {
 		},
 	}
 
-	// ROFL: https://docker-py.readthedocs.io/en/1.4.0/volumes/
-	config := &container.Config{
-		Image: image,
-		Env:   env,
-	}
-
 	// Look for Shuffle network and set it
-
-	// FIXME: Move this out of here and have it be a global setting. During init?
 	networkConfig := &network.NetworkingConfig{}
 	if len(shuffleNetwork) > 0 {
+		log.Printf("Starting worker with network %s", shuffleNetwork)
 		networkConfig = &network.NetworkingConfig{
 			EndpointsConfig: map[string]*network.EndpointSettings{
 				shuffleNetwork: {
@@ -139,7 +133,15 @@ func deployWorker(image string, identifier string, env []string) {
 			},
 		}
 
-		env = append(env, fmt.Sprintf("DOCKER_NETWORK", shuffleNetwork))
+		env = append(env, fmt.Sprintf("DOCKER_NETWORK=%s", shuffleNetwork))
+	} else {
+		log.Printf("Starting worker WITHOUT any specified network: %s", shuffleNetwork)
+	}
+
+	// ROFL: https://docker-py.readthedocs.io/en/1.4.0/volumes/
+	config := &container.Config{
+		Image: image,
+		Env:   env,
 	}
 
 	//test := &network.EndpointSettings{
diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go
index edb9c39c..48b11ebc 100644
--- a/functions/onprem/worker/worker.go
+++ b/functions/onprem/worker/worker.go
@@ -1107,6 +1107,13 @@ func main() {
 		}
 	}
 
+	shuffleNetwork := os.Getenv("DOCKER_NETWORK")
+	if len(shuffleNetwork) > 0 {
+		log.Printf("Running with Docker network %s", shuffleNetwork)
+	} else {
+		log.Printf("No docker network specified for Worker.")
+	}
+
 	// WORKER_TESTING_WORKFLOW should be a workflow ID
 	authorization := ""
 	executionId := ""