Skip to content

Commit 349de90

Browse files
motatoescoderabbitai[bot]greptile-apps[bot]
authored
add additional debug logs to cli (#1942)
* add additional debug logs to cli * Update cli/pkg/digger/digger.go Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update cli/pkg/digger/digger.go Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update cli/pkg/usage/usage.go Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * Update cli/pkg/drift/slack.go Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * fix fatal error * info * add more debug logs from gh token fetcher --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
1 parent e03f303 commit 349de90

File tree

10 files changed

+175
-143
lines changed

10 files changed

+175
-143
lines changed

cli/cmd/digger/default.go

+21-5
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,31 @@ import (
1313
"github.com/diggerhq/digger/libs/policy"
1414
lib_spec "github.com/diggerhq/digger/libs/spec"
1515
"github.com/spf13/cobra"
16-
"log"
16+
"log/slog"
1717
"os"
1818
"runtime/debug"
1919
)
2020

21+
func initLogger() {
22+
logLevel := os.Getenv("DIGGER_LOG_LEVEL")
23+
var level slog.Leveler
24+
if logLevel == "DEBUG" {
25+
level = slog.LevelDebug
26+
} else {
27+
level = slog.LevelInfo
28+
}
29+
logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
30+
Level: level,
31+
}))
32+
33+
slog.SetDefault(logger)
34+
35+
}
36+
2137
var defaultCmd = &cobra.Command{
2238
Use: "default",
2339
Run: func(cmd *cobra.Command, args []string) {
24-
40+
initLogger()
2541
specStr := os.Getenv("DIGGER_RUN_SPEC")
2642
if specStr != "" {
2743
var spec lib_spec.Spec
@@ -31,7 +47,7 @@ var defaultCmd = &cobra.Command{
3147
}
3248

3349
var spec_err error
34-
50+
3551
spec_err = spec2.RunSpec(
3652
spec,
3753
lib_spec.VCSProviderBasic{},
@@ -65,10 +81,10 @@ var defaultCmd = &cobra.Command{
6581

6682
defer func() {
6783
if r := recover(); r != nil {
68-
log.Println(fmt.Sprintf("stacktrace from panic: \n" + string(debug.Stack())))
84+
slog.Error(fmt.Sprintf("stacktrace from panic: " + string(debug.Stack())))
6985
err := usage.SendLogRecord(logLeader, fmt.Sprintf("Panic occurred. %s", r))
7086
if err != nil {
71-
log.Printf("Failed to send log record. %s\n", err)
87+
slog.Error("Failed to send log record", "error", err)
7288
}
7389
os.Exit(1)
7490
}

cli/cmd/digger/main.go

-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"fmt"
55
"github.com/diggerhq/digger/cli/pkg/usage"
6-
"log"
76
"os"
87
)
98

@@ -30,11 +29,3 @@ func main() {
3029
}
3130

3231
}
33-
34-
func init() {
35-
log.SetOutput(os.Stdout)
36-
37-
if os.Getenv("DEBUG") == "true" {
38-
log.SetFlags(log.Ltime | log.Lshortfile)
39-
}
40-
}

cli/cmd/digger/root.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
locking2 "github.com/diggerhq/digger/libs/locking"
1212
core_policy "github.com/diggerhq/digger/libs/policy"
1313
"github.com/spf13/cobra"
14-
"log"
14+
"log/slog"
1515
"net/http"
1616
"os"
1717
"time"
@@ -108,15 +108,15 @@ func PreRun(cmd *cobra.Command, args []string) {
108108
if os.Getenv("NO_BACKEND") == "true" {
109109
lock, err = locking2.GetLock()
110110
} else {
111-
log.Printf("Warning: not performing locking in cli since digger is invoked with orchestrator mode, any arguments to LOCKING_PROVIDER will be ignored")
111+
slog.Warn("Not performing locking in cli since digger is invoked with orchestrator mode, any arguments to LOCKING_PROVIDER will be ignored")
112112
lock = locking2.NoOpLock{}
113113
err = nil
114114
}
115115
if err != nil {
116-
log.Printf("Failed to create lock provider. %s\n", err)
116+
slog.Error("Failed to create lock provider", "error", err)
117117
os.Exit(2)
118118
}
119-
log.Println("Lock provider has been created successfully")
119+
slog.Info("Lock provider has been created successfully")
120120
}
121121

122122
var rootCmd = &cobra.Command{

0 commit comments

Comments
 (0)