From b0cff76a6e89110dec569a282116b79f4e0fbe09 Mon Sep 17 00:00:00 2001
From: Victor Yves Crispim <rotcivyves@hotmail.com>
Date: Mon, 11 Mar 2024 16:33:46 -0300
Subject: [PATCH] feat: allow server-manager to bypass log config

A workaround so Sunodo can display only the application output on its log

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                         |  3 ++-
 docs/config.md                       |  8 ++++++++
 internal/config/generate/Config.toml |  6 ++++++
 internal/config/get.go               |  5 +++++
 internal/services/server-manager.go  | 10 ++++++++--
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77d8bf6f7..880f9dacb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [Unreleased]
 
 ### Added
 
 - Added verification to ensure CARTESI_BLOCKCHAIN_ID matches the id returned from the Ethereum node
 - Added support for CARTESI_AUTH_PRIVATE_KEY and CARTESI_AUTH_PRIVATE_KEY_FILE
+- Added `CARTESI_EXPERIMENTAL_SERVER_MANAGER_BYPASS_LOG` env var to allow `server-manager` output to bypass all log configuration
 
 ## Changed
 
diff --git a/docs/config.md b/docs/config.md
index 5f8979bba..6898a5555 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -147,6 +147,14 @@ Address of the InputBox contract.
 
 * **Type:** `string`
 
+## `CARTESI_EXPERIMENTAL_SERVER_MANAGER_BYPASS_LOG`
+
+When enabled, prints server-manager output to stdout and stderr directly.
+All other log configurations are ignored.
+
+* **Type:** `bool`
+* **Default:** `"false"`
+
 ## `CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED`
 
 When enabled, the node does not start the authority-claimer service and the Redis server.
diff --git a/internal/config/generate/Config.toml b/internal/config/generate/Config.toml
index 212146fc6..a8b2771a6 100644
--- a/internal/config/generate/Config.toml
+++ b/internal/config/generate/Config.toml
@@ -256,3 +256,9 @@ go-type = "string"
 description = """
 External Redis endpoint for the node when running in the experimental sunodo validator mode."""
 
+[experimental.CARTESI_EXPERIMENTAL_SERVER_MANAGER_BYPASS_LOG]
+default = "false"
+go-type = "bool"
+description = """
+When enabled, prints server-manager output to stdout and stderr directly.
+All other log configurations are ignored."""
\ No newline at end of file
diff --git a/internal/config/get.go b/internal/config/get.go
index d5d9419bc..7e187d0dd 100644
--- a/internal/config/get.go
+++ b/internal/config/get.go
@@ -109,6 +109,11 @@ func GetCartesiContractsInputBoxAddress() string {
 	return v
 }
 
+func GetCartesiExperimentalServerManagerBypassLog() bool {
+	v := get("CARTESI_EXPERIMENTAL_SERVER_MANAGER_BYPASS_LOG", "false", true, false, toBool)
+	return v
+}
+
 func GetCartesiExperimentalSunodoValidatorEnabled() bool {
 	v := get("CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED", "false", true, false, toBool)
 	return v
diff --git a/internal/services/server-manager.go b/internal/services/server-manager.go
index 086809b2b..9e84f4b14 100644
--- a/internal/services/server-manager.go
+++ b/internal/services/server-manager.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"os"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -41,8 +42,13 @@ const waitDelay = 200 * time.Millisecond
 func (s ServerManager) Start(ctx context.Context, ready chan<- struct{}) error {
 	cmd := exec.CommandContext(ctx, s.Path, s.Args...)
 	cmd.Env = s.Env
-	cmd.Stderr = newLineWriter(commandLogger{s.Name})
-	cmd.Stdout = newLineWriter(commandLogger{s.Name})
+	if config.GetCartesiExperimentalServerManagerBypassLog() {
+		cmd.Stderr = os.Stderr
+		cmd.Stdout = os.Stdout
+	} else {
+		cmd.Stderr = newLineWriter(commandLogger{s.Name})
+		cmd.Stdout = newLineWriter(commandLogger{s.Name})
+	}
 	// Without a delay, cmd.Wait() will block forever waiting for the I/O pipes
 	// to be closed
 	cmd.WaitDelay = waitDelay