diff --git a/contribs/gnodev/cmd/gnodev/main.go b/contribs/gnodev/main.go similarity index 99% rename from contribs/gnodev/cmd/gnodev/main.go rename to contribs/gnodev/main.go index bcf37d6c9b9..56c204ce79d 100644 --- a/contribs/gnodev/cmd/gnodev/main.go +++ b/contribs/gnodev/main.go @@ -179,7 +179,7 @@ func execDev(cfg *devCfg, args []string, io commands.IO) error { loglevel = slog.LevelDebug } - logger := clogger.NewLogger(rt, loglevel, true) + logger := clogger.NewColumnLogger(rt, loglevel, true) loggerEvents := logger.WithGroup(EventServerLogName) emitterServer := emitter.NewServer(loggerEvents) @@ -344,7 +344,7 @@ func runPkgsWatcher(ctx context.Context, cfg *devCfg, pkgs []gnomod.Pkg, changed } const timeout = time.Millisecond * 500 -- + var debounceTimer <-chan time.Time pathList := []string{} diff --git a/contribs/gnodev/pkg/logger/log_column.go b/contribs/gnodev/pkg/logger/log_column.go index 2dd9a11a2a8..c4606a0394d 100644 --- a/contribs/gnodev/pkg/logger/log_column.go +++ b/contribs/gnodev/pkg/logger/log_column.go @@ -39,6 +39,7 @@ func NewColumnLogger(w io.Writer, level slog.Level, color bool) *slog.Logger { colorProfile: colorProfile, } + charmLogger.SetOutput(newColumeWriter(lipgloss.NewStyle(), "", w)) charmLogger.SetStyles(DefaultStyles()) charmLogger.SetColorProfile(colorProfile) charmLogger.SetReportCaller(false) @@ -73,7 +74,7 @@ func (cl *columnLogger) WithGroup(name string) slog.Handler { nlog := cl.Logger.With() // clone logger baseStyle := lipgloss.NewStyle().Foreground(lipgloss.Color(strconv.Itoa(stringToColor(name)))) - nlog.SetOutput(NewColumeWriter(baseStyle, name, cl.writer)) + nlog.SetOutput(newColumeWriter(baseStyle, name, cl.writer)) nlog.SetColorProfile(cl.colorProfile) return &columnLogger{ Logger: nlog, @@ -91,7 +92,7 @@ type columnWriter struct { writer io.Writer } -func NewColumeWriter(baseStyle lipgloss.Style, prefix string, writer io.Writer) *columnWriter { +func newColumeWriter(baseStyle lipgloss.Style, prefix string, writer io.Writer) *columnWriter { style := baseStyle. Border(lipgloss.ThickBorder(), false, true, false, false). BorderForeground(baseStyle.GetForeground()).