Skip to content

Commit

Permalink
fix: 跳过的变更版本不做上报 (#134)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ambition9186 authored Nov 19, 2024
1 parent 7a586d1 commit a1fb5cf
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions client/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,10 @@ func clearOldFiles(dir string, files []*ConfigItemFile) error {

// Execute 统一执行入口
func (r *Release) Execute(steps ...Function) error {
var err error
var (
err error
skip bool
)
// 填充appMate数据
r.AppMate.CursorID = r.CursorID
r.AppMate.StartTime = time.Now().UTC()
Expand All @@ -376,24 +379,30 @@ func (r *Release) Execute(steps ...Function) error {
}
}

if err = r.sendVersionChangeMessaging(bd); err != nil {
logger.Error("description failed to report the client change event",
slog.String("client_mode", r.ClientMode.String()), slog.Uint64("biz", uint64(r.BizID)),
slog.String("app", r.AppMate.App), logger.ErrAttr(err))
// 如果是跳过版本变更则不上报数据
if !skip {
if err = r.sendVersionChangeMessaging(bd); err != nil {
logger.Error("description failed to report the client change event",
slog.String("client_mode", r.ClientMode.String()), slog.Uint64("biz", uint64(r.BizID)),
slog.String("app", r.AppMate.App), logger.ErrAttr(err))
}
}

}()

// 一定要在该位置
// 不然会导致current_release_id是0的问题
var skip bool
if r.ClientMode == sfs.Watch {
skip, err = r.compareRelease()
if err != nil {
return err
}
}

// 跳过版本变更
if skip {
return nil
}

// 发送拉取前事件
if err = r.sendVersionChangeMessaging(bd); err != nil {
logger.Error("failed to send the pull status event", slog.Uint64("biz", uint64(r.BizID)),
Expand All @@ -405,10 +414,6 @@ func (r *Release) Execute(steps ...Function) error {
r.loopHeartbeat(bd)
}

if skip {
return nil
}

for _, step := range steps {
if err = step(); err != nil {
return err
Expand Down

0 comments on commit a1fb5cf

Please sign in to comment.