@@ -19,15 +19,17 @@ package main
1919import (
2020 "context"
2121 "errors"
22+ "log/slog"
2223 "os"
2324 "runtime"
2425 "runtime/pprof"
2526
2627 "github.com/fatih/color"
2728
29+ "github.com/deckhouse/deckhouse/pkg/log"
30+
2831 "github.com/deckhouse/dmt/internal/flags"
2932 "github.com/deckhouse/dmt/internal/fsutils"
30- "github.com/deckhouse/dmt/internal/logger"
3133 "github.com/deckhouse/dmt/internal/manager"
3234 "github.com/deckhouse/dmt/internal/metrics"
3335 "github.com/deckhouse/dmt/internal/version"
@@ -40,17 +42,17 @@ func main() {
4042
4143func runLint (dir string ) error {
4244 if flags .PprofFile != "" {
43- logger . InfoF ("Profiling enabled. Profile file: %s " , flags .PprofFile )
45+ log . Info ("Profiling enabled" , slog . String ( " file" , flags .PprofFile ) )
4446 defer func () {
4547 pproFile , err := fsutils .ExpandDir (flags .PprofFile )
4648 if err != nil {
47- logger . ErrorF ("could not get current working directory: %s " , err )
49+ log . Error ("could not get current working directory" , log . Err ( err ) )
4850 return
4951 }
50- logger . InfoF ("Writing memory profile to %s" , pproFile )
52+ log . Info ("Writing memory profile" , slog . String ( "file" , pproFile ) )
5153 f , err := os .Create (pproFile )
5254 if err != nil {
53- logger . ErrorF ("could not create memory profile: %s " , err )
55+ log . Error ("could not create memory profile" , log . Err ( err ) )
5456 return
5557 }
5658 defer f .Close ()
@@ -59,17 +61,19 @@ func runLint(dir string) error {
5961 // Alternatively, use Lookup("heap") for a profile
6062 // that has inuse_space as the default index.
6163 if err := pprof .Lookup ("allocs" ).WriteTo (f , 0 ); err != nil {
62- logger . ErrorF ("could not write memory profile: %s " , err )
64+ log . Error ("could not write memory profile" , log . Err ( err ) )
6365 return
6466 }
6567 }()
6668 }
6769 // enable color output for Github actions, do not remove it
6870 color .NoColor = false
69- logger . InfoF ("DMT version: %s, Commit: %s, Date: %s" , version .Version , version .Commit , version .Date )
71+ log . Info ("DMT version" , slog . String ( "version" , version .Version ), slog . String ( "commit" , version .Commit ), slog . String ( "date" , version .Date ) )
7072
7173 cfg , err := config .NewDefaultRootConfig (dir )
72- logger .CheckErr (err )
74+ if err != nil {
75+ log .Fatal ("default root config" , log .Err (err )) //nolint:gocritic
76+ }
7377
7478 // init metrics storage, should be done before running manager
7579 metrics .GetClient (dir )
0 commit comments