mirror of
https://github.com/yusing/godoxy.git
synced 2026-02-19 15:27:46 +01:00
5c8126c2e6
Updated logging statements across multiple files to utilize EmbedObject for enhanced context in log messages. This change improves the readability and consistency of log outputs, particularly in health monitoring and route validation processes.
42 lines
718 B
Go
42 lines
718 B
Go
package stream
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"syscall"
|
|
|
|
"github.com/rs/zerolog"
|
|
"github.com/rs/zerolog/log"
|
|
)
|
|
|
|
func convertErr(err error) error {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
switch {
|
|
case errors.Is(err, context.Canceled),
|
|
errors.Is(err, io.ErrClosedPipe),
|
|
errors.Is(err, syscall.ECONNRESET):
|
|
return nil
|
|
default:
|
|
return err
|
|
}
|
|
}
|
|
|
|
func logErr(stream zerolog.LogObjectMarshaler, err error, msg string) {
|
|
err = convertErr(err)
|
|
if err == nil {
|
|
return
|
|
}
|
|
log.Err(err).EmbedObject(stream).Msg(msg)
|
|
}
|
|
|
|
func logErrf(stream zerolog.LogObjectMarshaler, err error, format string, v ...any) {
|
|
err = convertErr(err)
|
|
if err == nil {
|
|
return
|
|
}
|
|
log.Err(err).EmbedObject(stream).Msgf(format, v...)
|
|
}
|