From b15011366f51717e629ddc3ad3c73b9f261827e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volkan=20=C3=96z=C3=A7elik?= Date: Sun, 31 Mar 2024 20:38:30 -0700 Subject: [PATCH] Fix init command tombstone functionality (#769) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * experimental Signed-off-by: Volkan Özçelik * debugging tombstone data Signed-off-by: Volkan Özçelik * fix tombstone Signed-off-by: Volkan Özçelik * typo fix Signed-off-by: Volkan Özçelik * manifest update Signed-off-by: Volkan Özçelik --------- Signed-off-by: Volkan Özçelik --- app/sentinel/busywait/initialization/run.go | 8 +++++--- core/log/std/envinfo.go | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/sentinel/busywait/initialization/run.go b/app/sentinel/busywait/initialization/run.go index 4a707bef..38e154f4 100644 --- a/app/sentinel/busywait/initialization/run.go +++ b/app/sentinel/busywait/initialization/run.go @@ -142,7 +142,7 @@ dance: if err != nil { log.InfoLn( cid, - "RunInitCommands: no initialization file found... skipping custom initialization.", + "RunInitCommands: no tombstone file found... skipping custom initialization.", ) return } @@ -156,10 +156,12 @@ dance: data, err := os.ReadFile(tombstonePath) - if strings.TrimSpace(string(data)) == "exit" { + log.InfoLn(cid, "tombstone data '", string(data), "'") + + if strings.TrimSpace(string(data)) == "complete" { log.InfoLn( cid, - "RunInitCommands: Initialization already exit... skipping custom initialization.", + "RunInitCommands: Already initialized. Skipping custom initialization.", ) return } diff --git a/core/log/std/envinfo.go b/core/log/std/envinfo.go index 5f078ff9..13f9012c 100644 --- a/core/log/std/envinfo.go +++ b/core/log/std/envinfo.go @@ -68,7 +68,7 @@ func printFormattedInfo(id *string, info map[string]string) { for _, key := range infoKeys { padding := strings.Repeat(" ", maxLength-len(key)) - fmt.Printf("%s%s%s: %s\n", idp, padding, toCustomCase(key), info[key]) + fmt.Printf("%s %s%s: %s\n", idp, padding, toCustomCase(key), info[key]) } }