From db39d6b7aafe4ec670ee56c5747a88ba1ab422fc Mon Sep 17 00:00:00 2001
From: Sawjan Gurung <saw.jan.grg3e@gmail.com>
Date: Wed, 12 Jul 2023 11:32:03 +0545
Subject: [PATCH] (ociswrapper): separate ociswrapper logs from ocis logs
 (#6776)

---
 tests/ociswrapper/log/log.go         | 11 ++++++++
 tests/ociswrapper/ocis/ocis.go       | 41 ++++++++++++++--------------
 tests/ociswrapper/wrapper/wrapper.go |  5 ++--
 3 files changed, 35 insertions(+), 22 deletions(-)
 create mode 100644 tests/ociswrapper/log/log.go

diff --git a/tests/ociswrapper/log/log.go b/tests/ociswrapper/log/log.go
new file mode 100644
index 00000000000..6ecf3355ffd
--- /dev/null
+++ b/tests/ociswrapper/log/log.go
@@ -0,0 +1,11 @@
+package log
+
+import "log"
+
+func Println(message string) {
+	log.Println("[ociswrapper]", message)
+}
+
+func Panic(err error) {
+	log.Panic("[ociswrapper] ", err.Error())
+}
diff --git a/tests/ociswrapper/ocis/ocis.go b/tests/ociswrapper/ocis/ocis.go
index 55659263ab2..5bad143c7fb 100644
--- a/tests/ociswrapper/ocis/ocis.go
+++ b/tests/ociswrapper/ocis/ocis.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"crypto/tls"
 	"fmt"
-	"log"
 	"net/http"
 	"os"
 	"os/exec"
@@ -12,6 +11,7 @@ import (
 	"time"
 
 	"ociswrapper/common"
+	"ociswrapper/log"
 	"ociswrapper/ocis/config"
 )
 
@@ -33,45 +33,48 @@ func Start(envMap map[string]any) {
 	}
 	cmd.Env = append(cmd.Env, environments...)
 
-	stderr, err := cmd.StderrPipe()
+	logs, err := cmd.StderrPipe()
 	if err != nil {
-		fmt.Println(err)
+		log.Panic(err)
 	}
-	stdout, err := cmd.StdoutPipe()
+	output, err := cmd.StdoutPipe()
 	if err != nil {
-		fmt.Println(err)
+		log.Panic(err)
 	}
 
 	err = cmd.Start()
 	if err != nil {
-		fmt.Println(err)
+		log.Panic(err)
 	}
 
-	stderrScanner := bufio.NewScanner(stderr)
-	for stderrScanner.Scan() {
-		m := stderrScanner.Text()
+	// Read and print the logs when the 'ocis server' command is running
+	logScanner := bufio.NewScanner(logs)
+	for logScanner.Scan() {
+		m := logScanner.Text()
 		fmt.Println(m)
 	}
-	stdoutScanner := bufio.NewScanner(stdout)
-	for stdoutScanner.Scan() {
-		m := stdoutScanner.Text()
+	// Read output when the 'ocis server' command gets exited
+	outputScanner := bufio.NewScanner(output)
+	for outputScanner.Scan() {
+		m := outputScanner.Text()
 		fmt.Println(m)
 		retryCount++
 
 		maxRetry, _ := strconv.Atoi(config.Get("retry"))
 		if retryCount <= maxRetry {
-			fmt.Println(fmt.Sprintf("Retry starting oCIS server... (retry %v)", retryCount))
+			log.Println(fmt.Sprintf("Retry starting oCIS server... (retry %v)", retryCount))
 			// Stop and start again
 			Stop()
 			Start(envMap)
 		}
 	}
+	cmd.Wait()
 }
 
 func Stop() {
 	err := cmd.Process.Kill()
 	if err != nil {
-		log.Panic("Cannot kill oCIS server")
+		log.Panic(err)
 	}
 	cmd.Wait()
 }
@@ -93,14 +96,12 @@ func WaitForConnection() bool {
 	for {
 		select {
 		case <-timeout:
-			fmt.Println(fmt.Sprintf("%v seconds timeout waiting for oCIS server", int64(timeoutValue.Seconds())))
+			log.Println(fmt.Sprintf("%v seconds timeout waiting for oCIS server", int64(timeoutValue.Seconds())))
 			return false
 		default:
 			_, err := client.Get(config.Get("url"))
-			if err != nil {
-				fmt.Println("Waiting for oCIS server...")
-			} else {
-				fmt.Println(fmt.Sprintf("oCIS server is ready to accept requests"))
+			if err == nil {
+				log.Println("oCIS server is ready to accept requests")
 				return true
 			}
 			// 500 milliseconds poll interval
@@ -110,7 +111,7 @@ func WaitForConnection() bool {
 }
 
 func Restart(envMap map[string]any) bool {
-	log.Print("Restarting oCIS server...")
+	log.Println("Restarting oCIS server...")
 	Stop()
 
 	common.Wg.Add(1)
diff --git a/tests/ociswrapper/wrapper/wrapper.go b/tests/ociswrapper/wrapper/wrapper.go
index db7aa869e96..e5fc80c9aee 100644
--- a/tests/ociswrapper/wrapper/wrapper.go
+++ b/tests/ociswrapper/wrapper/wrapper.go
@@ -1,9 +1,10 @@
 package wrapper
 
 import (
-	"log"
+	"fmt"
 	"net/http"
 	"ociswrapper/common"
+	"ociswrapper/log"
 	"ociswrapper/ocis/config"
 	"ociswrapper/wrapper/handlers"
 )
@@ -26,7 +27,7 @@ func Start(port string) {
 
 	httpServer.Handler = mux
 
-	log.Printf("Starting server on port %s...", port)
+	log.Println(fmt.Sprintf("Starting ociswrapper on port %s...", port))
 
 	err := httpServer.ListenAndServe()
 	if err != nil {