fix logs not printing correctly, removed unneccessary loggers

This commit is contained in:
yusing
2025-01-20 17:42:54 +08:00
parent 64e85c3076
commit dd0bbdc7b4
38 changed files with 130 additions and 150 deletions

View File

@@ -43,8 +43,6 @@ type (
}
)
var logger = logging.With().Str("module", "accesslog").Logger()
func NewAccessLogger(parent task.Parent, io AccessLogIO, cfg *Config) *AccessLogger {
l := &AccessLogger{
task: parent.Subtask("accesslog"),
@@ -133,7 +131,7 @@ func (l *AccessLogger) Flush(force bool) {
}
func (l *AccessLogger) handleErr(err error) {
E.LogError("failed to write access log", err, &logger)
E.LogError("failed to write access log", err)
}
func (l *AccessLogger) start() {
@@ -170,6 +168,6 @@ func (l *AccessLogger) write(data []byte) {
if err != nil {
l.handleErr(err)
} else {
logger.Debug().Msg("access log flushed to " + l.io.Name())
logging.Debug().Msg("access log flushed to " + l.io.Name())
}
}

View File

@@ -6,6 +6,7 @@ import (
"path"
"sync"
"github.com/yusing/go-proxy/internal/logging"
"github.com/yusing/go-proxy/internal/task"
"github.com/yusing/go-proxy/internal/utils"
)
@@ -55,7 +56,7 @@ func (f *File) Close() error {
}
func (f *File) closeOnZero() {
defer logger.Debug().
defer logging.Debug().
Str("path", f.path).
Msg("access log closed")

View File

@@ -8,6 +8,8 @@ import (
"net/url"
"strconv"
"time"
"github.com/yusing/go-proxy/internal/logging"
)
type (
@@ -137,6 +139,6 @@ func (f *JSONFormatter) Format(line *bytes.Buffer, req *http.Request, res *http.
marshaller := json.NewEncoder(line)
err := marshaller.Encode(entry)
if err != nil {
logger.Err(err).Msg("failed to marshal json log")
logging.Err(err).Msg("failed to marshal json log")
}
}