added glob matching for ignored paths in hws
This commit is contained in:
@@ -6,24 +6,25 @@ import (
|
||||
"net/url"
|
||||
|
||||
"git.haelnorr.com/h/golib/hlog"
|
||||
"github.com/gobwas/glob"
|
||||
)
|
||||
|
||||
type logger struct {
|
||||
logger *hlog.Logger
|
||||
ignoredPaths []string
|
||||
ignoredPaths []glob.Glob
|
||||
}
|
||||
|
||||
// TODO: add tests to make sure all the fields are correctly set
|
||||
// LogError uses the attached logger to log a HWSError
|
||||
func (s *Server) LogError(err HWSError) {
|
||||
if s.logger == nil {
|
||||
return
|
||||
}
|
||||
switch err.Level {
|
||||
case ErrorDEBUG:
|
||||
s.logger.logger.Debug().Msg(err.Message)
|
||||
s.logger.logger.Debug().Err(err.Error).Msg(err.Message)
|
||||
return
|
||||
case ErrorINFO:
|
||||
s.logger.logger.Info().Msg(err.Message)
|
||||
s.logger.logger.Info().Err(err.Error).Msg(err.Message)
|
||||
return
|
||||
case ErrorWARN:
|
||||
s.logger.logger.Warn().Err(err.Error).Msg(err.Message)
|
||||
@@ -53,10 +54,10 @@ func (server *Server) LogFatal(err error) {
|
||||
server.logger.logger.Fatal().Err(err).Msg("A fatal error has occured")
|
||||
}
|
||||
|
||||
// Server.AddLogger adds a logger to the server to use for request logging.
|
||||
// AddLogger adds a logger to the server to use for request logging.
|
||||
func (server *Server) AddLogger(hlogger *hlog.Logger) error {
|
||||
if hlogger == nil {
|
||||
return errors.New("Unable to add logger, no logger provided")
|
||||
return errors.New("unable to add logger, no logger provided")
|
||||
}
|
||||
server.logger = &logger{
|
||||
logger: hlogger,
|
||||
@@ -64,7 +65,7 @@ func (server *Server) AddLogger(hlogger *hlog.Logger) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Server.LoggerIgnorePaths sets a list of URL paths to ignore logging for.
|
||||
// LoggerIgnorePaths sets a list of URL paths to ignore logging for.
|
||||
// Path should match the url.URL.Path field, see https://pkg.go.dev/net/url#URL
|
||||
// Useful for ignoring requests to CSS files or favicons
|
||||
func (server *Server) LoggerIgnorePaths(paths ...string) error {
|
||||
@@ -76,9 +77,22 @@ func (server *Server) LoggerIgnorePaths(paths ...string) error {
|
||||
u.RawQuery == "" &&
|
||||
u.Fragment == ""
|
||||
if !valid {
|
||||
return fmt.Errorf("Invalid path: '%s'", path)
|
||||
return fmt.Errorf("invalid path: '%s'", path)
|
||||
}
|
||||
}
|
||||
server.logger.ignoredPaths = paths
|
||||
server.logger.ignoredPaths = prepareGlobs(paths)
|
||||
return nil
|
||||
}
|
||||
|
||||
func prepareGlobs(paths []string) []glob.Glob {
|
||||
compiledGlobs := make([]glob.Glob, 0, len(paths))
|
||||
for _, pattern := range paths {
|
||||
g, err := glob.Compile(pattern)
|
||||
if err != nil {
|
||||
// If pattern fails to compile, skip it
|
||||
continue
|
||||
}
|
||||
compiledGlobs = append(compiledGlobs, g)
|
||||
}
|
||||
return compiledGlobs
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user