修复时间轮系统bug

lego/sys/timewheel/timewheel.go

@@ -2,8 +2,8 @@ package timewheel
 
 import (
 	"context"
+	"go_dreamfactory/lego"
 	"go_dreamfactory/lego/sys/log"
-	"runtime"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -185,8 +185,9 @@ func (this *TimeWheel) handleTick() {
 		}
 
 		if task.async {
-			go func(task *Task) {
+			go func(_task *Task) {
-				go this.calltask(task, task.args...)
+				this.calltask(_task, _task.args...)
+				this.collectTask(task)
 			}(task)
 
 		} else {
@@ -200,10 +201,10 @@ func (this *TimeWheel) handleTick() {
 			this.putCircle(task, modeIsCircle)
 			continue
 		}
-
+		if !task.async { //异步模式下不能清理
-		// gc
 			this.collectTask(task)
 		}
+	}
 
 	if this.currentIndex == this.bucketsNum-1 {
 		this.currentIndex = 0
@@ -215,13 +216,11 @@ func (this *TimeWheel) handleTick() {
 
 // 执行时间轮事件 捕捉异常错误 防止程序崩溃
 func (this *TimeWheel) calltask(task *Task, args ...interface{}) {
-	defer func() { //程序异常 收集异常信息传递给前端显示
+	defer lego.Recover("TimeWheel")
-		if r := recover(); r != nil {
+	if task.callback == nil {
-			buf := make([]byte, 4096)
+		log.Error("sys.timeWheel task callback err!", log.Field{Key: "task", Value: task})
-			l := runtime.Stack(buf, false)
+		return
-			log.Errorf("timewheel err:%s", string(buf[0:l]))
 	}
-	}()
 	task.callback(task, task.args...)
 }
 

modules/friend/api_cross_agree.go

@@ -153,7 +153,7 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
 			return
 		}
 
-		event.TriggerEvent(comm.EventFriendChange, uid, len(self.FriendIds))
+		event.TriggerEvent(comm.EventFriendChange, uid, int32(len(self.FriendIds)))
 	}
 
 	// 拥有xx个好友

pb/errorcode.pb.go

@@ -412,6 +412,8 @@ const (
 	ErrorCode_PassonHeroNumNotEnough ErrorCode = 4701 //英雄数量不足
 	ErrorCode_PassonHeroUnavailable  ErrorCode = 4702 //当前英雄不可用
 	ErrorCode_PassonSeatStateErr     ErrorCode = 4703 //传功塔状态错误
+	//战令
+	ErrorCode_WarorderNoOpen ErrorCode = 4801 //活动未开启
 )
 
 // Enum value maps for ErrorCode.
@@ -766,6 +768,7 @@ var (
 		4701: "PassonHeroNumNotEnough",
 		4702: "PassonHeroUnavailable",
 		4703: "PassonSeatStateErr",
+		4801: "WarorderNoOpen",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                       0,
@@ -1117,6 +1120,7 @@ var (
 		"PassonHeroNumNotEnough":        4701,
 		"PassonHeroUnavailable":         4702,
 		"PassonSeatStateErr":            4703,
+		"WarorderNoOpen":                4801,
 	}
 )
 
@@ -1151,7 +1155,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xa3, 0x40, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xb8, 0x40, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1665,8 +1669,9 @@ var file_errorcode_proto_rawDesc = []byte{
 	0xdd, 0x24, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x48, 0x65, 0x72, 0x6f,
 	0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x10, 0xde, 0x24, 0x12, 0x17,
 	0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x53, 0x65, 0x61, 0x74, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x45, 0x72, 0x72, 0x10, 0xdf, 0x24, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x65, 0x45, 0x72, 0x72, 0x10, 0xdf, 0x24, 0x12, 0x13, 0x0a, 0x0e, 0x57, 0x61, 0x72, 0x6f, 0x72,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xc1, 0x25, 0x42, 0x06, 0x5a, 0x04,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (