优化请求hook处理

This commit is contained in:
孟帅
2023-02-09 14:35:35 +08:00
parent 1efbf698e2
commit f7307e4fd4
4 changed files with 47 additions and 30 deletions

View File

@@ -7,11 +7,13 @@
package hook
import (
"context"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gtime"
"hotgo/internal/library/contexts"
"hotgo/internal/service"
"hotgo/utility/simple"
)
// AccessLog 访问日志
@@ -29,9 +31,9 @@ func (s *sHook) AccessLog(r *ghttp.Request) {
// 计算运行耗时
contexts.SetTakeUpTime(ctx, gtime.TimestampMilli()-r.EnterTime)
go func() {
simple.SafeGo(ctx, func(ctx context.Context) {
if err := service.SysLog().AutoLog(ctx); err != nil {
g.Log().Info(ctx, "hook AccessLog err:", err)
g.Log().Warningf(ctx, "hook AccessLog err:%+v", err)
}
}()
})
}

View File

@@ -8,6 +8,7 @@ import (
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/os/gtimer"
"hotgo/internal/library/contexts"
"hotgo/utility/simple"
"sync"
"time"
)
@@ -69,12 +70,15 @@ func (s *sHook) LastActive(r *ghttp.Request) {
}
if allow(memberId) {
_, err := g.Model("admin_member").Ctx(ctx).
Where("id", memberId).
Data(g.Map{"last_active_at": gtime.Now()}).
Update()
if err != nil {
g.Log().Warningf(ctx, "hook LastActive err:%+v, memberId:%v", err, memberId)
}
simple.SafeGo(ctx, func(ctx context.Context) {
_, err := g.Model("admin_member").Ctx(ctx).
Where("id", memberId).
WhereLT("last_active_at", gtime.Now()).
Data(g.Map{"last_active_at": gtime.Now()}).
Update()
if err != nil {
g.Log().Warningf(ctx, "hook LastActive err:%+v, memberId:%v", err, memberId)
}
})
}
}

View File

@@ -104,29 +104,40 @@ func (s *sSysLog) RealWrite(ctx context.Context, commonLog entity.SysLog) (err e
}
// AutoLog 根据配置自动记录请求日志
func (s *sSysLog) AutoLog(ctx context.Context) (err error) {
config, err := service.SysConfig().GetLoadLog(ctx)
if err != nil {
return err
}
func (s *sSysLog) AutoLog(ctx context.Context) error {
return g.Try(ctx, func(ctx context.Context) {
var err error
defer func() {
if err != nil {
panic(err)
}
}()
if !config.Switch {
return nil
}
config, err := service.SysConfig().GetLoadLog(ctx)
if err != nil {
return
}
data := s.AnalysisLog(ctx)
if ok := validate.InSliceExistStr(config.Module, data.Module); !ok {
return nil
}
if !config.Switch {
return
}
if ok := validate.InSliceExistStr(config.SkipCode, gconv.String(data.ErrorCode)); ok {
return nil
}
data := s.AnalysisLog(ctx)
if ok := validate.InSliceExistStr(config.Module, data.Module); !ok {
return
}
if config.Queue {
return queue.Push(consts.QueueLogTopic, data)
}
return s.RealWrite(ctx, data)
if ok := validate.InSliceExistStr(config.SkipCode, gconv.String(data.ErrorCode)); ok {
return
}
if config.Queue {
err = queue.Push(consts.QueueLogTopic, data)
return
}
err = s.RealWrite(ctx, data)
return
})
}
// AnalysisLog 解析日志数据