From 9a366e30ec771e45079018df768d5be7f9609e29 Mon Sep 17 00:00:00 2001
From: Frikky <frikky@shuffler.io>
Date: Sun, 22 Oct 2023 22:03:46 +0200
Subject: [PATCH] Minor orborus fix

---
 backend/go-app/go.sum               | 2 ++
 backend/go-app/walkoff.go           | 2 +-
 functions/onprem/orborus/orborus.go | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/go-app/go.sum b/backend/go-app/go.sum
index db29bc99..d3fd1d01 100644
--- a/backend/go-app/go.sum
+++ b/backend/go-app/go.sum
@@ -393,6 +393,8 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shuffle/shuffle-shared v0.4.56 h1:Z29GZB/eipt2aA4i+6heO1V2mrUmHPdw4QN4X4b1HdU=
 github.com/shuffle/shuffle-shared v0.4.56/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI=
+github.com/shuffle/shuffle-shared v0.4.59 h1:5Sv8aorgQJFZr3cCKltfycdXzp9v5zlF2l3GZXjrTEo=
+github.com/shuffle/shuffle-shared v0.4.59/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 4c29f71e..aa5d5e97 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -561,7 +561,7 @@ func handleGetStreamResults(resp http.ResponseWriter, request *http.Request) {
 		}
 
 		if len(workflowExecution.ExecutionOrg) > 0 && user.ActiveOrg.Id == workflowExecution.ExecutionOrg && user.Role == "admin" {
-			log.Printf("[DEBUG] User %s is in correct org. Allowing org continuation for execution!", user.Username)
+			//log.Printf("[DEBUG] User %s is in correct org. Allowing org continuation for execution!", user.Username)
 		} else {
 			log.Printf("[WARNING] Bad authorization key when getting stream results %s.", actionResult.ExecutionId)
 			resp.WriteHeader(401)
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index afa46d97..a24f3343 100755
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -1036,6 +1036,7 @@ func getOrborusStats() shuffle.OrborusStats {
 		newStats.MaxMemory = int(pers.MemTotal)
 	}
 
+
 		// Get list of all running containers
 	containers, err := dockercli.ContainerList(ctx, types.ContainerListOptions{})
 	if err != nil {
@@ -1103,8 +1104,9 @@ func getOrborusStats() shuffle.OrborusStats {
 		}
 	}
 
-	newStats.CPUPercent = totalCPU
+	newStats.CPUPercent = totalCPU/float64(newStats.CPU)
 	newStats.MemoryPercent = memUsage
+
 	log.Printf("[DEBUG] CPU: %.2f, Memory: %.2f", newStats.CPUPercent, newStats.MemoryPercent)
 
 	/*