commit 33dc0c9717ce89f4569fc2e57aa8eba80b48be4f · kot.pink/caddy-anubis

+3 -7

caddy_anubis.go

···

       14
       14
        
       	"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"

     

       15
       15
        
       	"github.com/caddyserver/caddy/v2/modules/caddyhttp"

     

       16
       16
        
       	"go.uber.org/zap"

     

       17
       17
       -
       	"go.uber.org/zap/exp/zapslog"

     

       18
       17
        
       )

     

       19
       18
        
       

     

       20
       19
        
       func init() {

     
···

       48
       47
        
       )

     

       49
       48
        
       

     

       50
       49
        
       func (m *AnubisMiddleware) Provision(ctx caddy.Context) error {

     

       51
       51
       -
       	m.log = ctx.Logger(m)

     

       50
       50
       +
       	m.log = ctx.Logger()

     

       52
       51
        
       

     

       53
       53
       -
       	// TODO: figure out a better level for this

     

       54
       54
       -
       	zs := zapslog.NewHandler(m.log.Core(), zapslog.AddStacktraceAt(slog.LevelError + 1))

     

       55
       55
       -
       

     

       56
       56
       -
       	// TODO: don't set the global slog logger

     

       52
       52
       +
       	// TODO: don't set the global slog logger!

     

       57
       53
        
       	// currently, anubis does not allow custom loggers (https://github.com/TecharoHQ/anubis/issues/864)

     

       58
       58
       -
       	sl := slog.New(zs)

     

       54
       54
       +
       	sl := ctx.Slogger()

     

       59
       55
        
       	slog.SetDefault(sl)

     

       60
       56
        
       

     

       61
       57
        
       	m.log.Debug("loading anubis policies", zap.String("policy_file", m.PolicyFname), zap.Int("default_difficulty", m.DefaultDifficulty))

example/Caddyfile

···

       8
       8
        
       		not path /api/* # exclude api routes from anubis

     

       9
       9
        
       	}

     

       10
       10
        
       

     

       11
       11
       +
       	log http.handlers.anubis {

     

       12
       12
       +
       	    level DEBUG

     

       13
       13
       +
       	}

     

       14
       14
       +
       

     

       11
       15
        
       	anubis @anubis {

     

       12
       16
        
       	    # This setting gets overridden a lot by the default bot policy.

     

       13
       17
        
       	    difficulty 4