distinguish pretty and text logs
+7
-4
+7
-4
cmd/up.go
+7
-4
cmd/up.go
···
84
84
switch flags.logFormat {
85
85
case "json":
86
86
logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{}))
87
-
case "text", "":
87
+
case "text":
88
+
logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{}))
89
+
case "pretty", "":
88
90
logger = slog.New(tint.NewHandler(os.Stdout, &tint.Options{
89
91
NoColor: !isatty.IsTerminal(os.Stdout.Fd()),
90
92
}))
···
145
147
go watcher.Start()
146
148
defer watcher.Stop()
147
149
150
+
logMiddleware := sloghttp.NewWithConfig(logger.With("logger", "http"), sloghttp.Config{
151
+
WithRequestID: false,
152
+
})
153
+
148
154
if flags.onDemandTLS {
149
155
config := zap.NewProductionConfig()
150
156
config.EncoderConfig.TimeKey = "time"
···
168
174
},
169
175
}
170
176
logger.Info("serving on-demand https", "domain", k.String("domain"), "dir", k.String("dir"))
171
-
logMiddleware := sloghttp.New(logger.With("logger", "http"))
172
177
go certmagic.HTTPS(nil, logMiddleware(handler))
173
178
} else if flags.tlsCert != "" && flags.tlsKey != "" {
174
179
cert, err := tls.LoadX509KeyPair(flags.tlsCert, flags.tlsKey)
···
192
197
}
193
198
194
199
logger.Info("serving https", "domain", k.String("domain"), "dir", k.String("dir"), "addr", addr)
195
-
logMiddleware := sloghttp.New(logger.With("logger", "http"))
196
200
go http.Serve(ln, logMiddleware(handler))
197
201
} else {
198
202
addr := flags.addr
···
207
211
}
208
212
209
213
logger.Info("serving http", "domain", k.String("domain"), "dir", k.String("dir"), "addr", addr)
210
-
logMiddleware := sloghttp.New(logger.With("logger", "http"))
211
214
go http.Serve(ln, logMiddleware(handler))
212
215
}
213
216