Commit b3eb9655 authored by chenweijian's avatar chenweijian

Merge remote-tracking branch 'origin/master' into fix/group_support

parents 471da943 43e1f9a9
...@@ -7,6 +7,7 @@ import ( ...@@ -7,6 +7,7 @@ import (
"hilo-group/domain/event/mic_ev" "hilo-group/domain/event/mic_ev"
"hilo-group/domain/model/group_m" "hilo-group/domain/model/group_m"
"hilo-group/domain/service/group_mic_s" "hilo-group/domain/service/group_mic_s"
"time"
) )
func OnMicCheck() { func OnMicCheck() {
...@@ -47,24 +48,27 @@ func OnMicCheck() { ...@@ -47,24 +48,27 @@ func OnMicCheck() {
} }
func OnMicQueue() { func OnMicQueue() {
go func() { for i := 0; i < 4; i++ {
for true { go func() {
model := domain.CreateModelNil() for true {
if onMic := mic_c.BLPopQueueOnMic(model); onMic != nil { model := domain.CreateModelNil()
// 群组上麦经验 if onMic := mic_c.BLPopQueueOnMic(model); onMic != nil {
if err := group_mic_s.NewGroupPowerService(model.MyContext).IncrGroupPowerOnMicExpAndTime(onMic.GroupUuid, onMic.UserId, onMic.Timestamp); err != nil { start := time.Now()
model.Log.Errorf("cron micIn GroupPowerOnMicExp err:%v", err) // 群组上麦经验
} else { if err := group_mic_s.NewGroupPowerService(model.MyContext).IncrGroupPowerOnMicExpAndTime(onMic.GroupUuid, onMic.UserId, onMic.Timestamp); err != nil {
model.Log.Infof("cron micIn GroupPowerOnMicExp success, groupId:%v, userId:%v", onMic.GroupUuid, onMic.UserId) model.Log.Errorf("cron micIn GroupPowerOnMicExp err:%v", err)
} } else {
model.Log.Infof("cron micIn GroupPowerOnMicExp success, groupId:%v, userId:%v,cost:%vs", onMic.GroupUuid, onMic.UserId, time.Now().Sub(start).Seconds())
}
// 用户上麦 // 用户上麦
//if err := mic_m.IncrUserOnMic(model, onMic.UserId, onMic.Timestamp); err != nil { //if err := mic_m.IncrUserOnMic(model, onMic.UserId, onMic.Timestamp); err != nil {
// model.Log.Errorf("cron micIn IncrUserOnMic err:%v", err) // model.Log.Errorf("cron micIn IncrUserOnMic err:%v", err)
//} else { //} else {
// model.Log.Infof("cron micIn IncrUserOnMic success,userId:%v", onMic.UserId) // model.Log.Infof("cron micIn IncrUserOnMic success,userId:%v", onMic.UserId)
//} //}
}
} }
} }()
}() }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment