diff --git a/ekafka/container.go b/ekafka/container.go index 1202c74..abda837 100644 --- a/ekafka/container.go +++ b/ekafka/container.go @@ -41,14 +41,14 @@ func (c *Container) Build(options ...Option) *Component { // 放第一个时间才准确 options = append(options, WithClientInterceptor(fixedClientInterceptor(c.name, c.config))) options = append(options, WithClientInterceptor(traceClientInterceptor(c.name, c.config))) - options = append(options, WithClientInterceptor(accessClientInterceptor(c.name, c.config))) + options = append(options, WithClientInterceptor(accessClientInterceptor(c.name, c.config, c.logger))) if c.config.EnableMetricInterceptor { options = append(options, WithClientInterceptor(metricClientInterceptor(c.name, c.config))) } options = append(options, WithServerInterceptor(fixedServerInterceptor(c.name, c.config))) options = append(options, WithServerInterceptor(traceServerInterceptor(c.name, c.config))) - options = append(options, WithServerInterceptor(accessServerInterceptor(c.name, c.config))) + options = append(options, WithServerInterceptor(accessServerInterceptor(c.name, c.config, c.logger))) if c.config.EnableMetricInterceptor { options = append(options, WithServerInterceptor(metricServerInterceptor(c.name, c.config))) } diff --git a/ekafka/interceptor_client.go b/ekafka/interceptor_client.go index c968fe1..93de92b 100644 --- a/ekafka/interceptor_client.go +++ b/ekafka/interceptor_client.go @@ -87,7 +87,7 @@ func traceClientInterceptor(compName string, c *config) ClientInterceptor { } } -func accessClientInterceptor(compName string, c *config) ClientInterceptor { +func accessClientInterceptor(compName string, c *config, logger *elog.Component) ClientInterceptor { return func(next clientProcessFn) clientProcessFn { return func(ctx context.Context, msgs Messages, cmd *cmd) error { loggerKeys := transport.CustomContextKeys() @@ -129,8 +129,7 @@ func accessClientInterceptor(compName string, c *config) ClientInterceptor { if c.EnableAccessInterceptorRes { fields = append(fields, elog.Any("res", json.RawMessage(xstring.JSON(cmd.res)))) } - - elog.Info("access", fields...) + logger.Info("access", fields...) } if !eapp.IsDevelopmentMode() { diff --git a/ekafka/interceptor_server.go b/ekafka/interceptor_server.go index 77e871c..b40a20b 100644 --- a/ekafka/interceptor_server.go +++ b/ekafka/interceptor_server.go @@ -76,7 +76,7 @@ func traceServerInterceptor(compName string, c *config) ServerInterceptor { } } -func accessServerInterceptor(compName string, c *config) ServerInterceptor { +func accessServerInterceptor(compName string, c *config, logger *elog.Component) ServerInterceptor { return func(next serverProcessFn) serverProcessFn { return func(ctx context.Context, msgs Messages, cmd *cmd) error { err := next(ctx, msgs, cmd) @@ -127,7 +127,7 @@ func accessServerInterceptor(compName string, c *config) ServerInterceptor { if c.EnableAccessInterceptorRes { fields = append(fields, elog.Any("res", json.RawMessage(xstring.JSON(messageToLog(cmd.msg))))) } - elog.Info("access", fields...) + logger.Info("access", fields...) } if !eapp.IsDevelopmentMode() {