This commit is contained in:
gazebo
2019-04-27 18:39:00 +08:00
parent f48ff514d8
commit 8249f1727f

View File

@@ -202,12 +202,14 @@ func (e *EventHub) unregisterConsumer(notifyChan chan *EventInfo) {
} }
func (e *EventHub) PostNewEvent(eventCategory string, event *EventInfo) { func (e *EventHub) PostNewEvent(eventCategory string, event *EventInfo) {
utils.CallFuncAsync(func() {
newEvent := *event newEvent := *event
newEvent.Type = composeEventType(eventCategory, event.Type) newEvent.Type = composeEventType(eventCategory, event.Type)
e.cmdChan <- &tCmd{ e.cmdChan <- &tCmd{
cmdType: cmdNewEvent, cmdType: cmdNewEvent,
data: event, data: event,
} }
})
} }
func (e *EventHub) GetEvent(eventCategory string, eventTypeList []string, criteria interface{}, waitTime time.Duration) (event *EventInfo, err error) { func (e *EventHub) GetEvent(eventCategory string, eventTypeList []string, criteria interface{}, waitTime time.Duration) (event *EventInfo, err error) {
@@ -251,6 +253,10 @@ func composeEventType(eventCategory, eventType string) string {
func splitEventType(eventType string) (eventCategory, pureEventType string) { func splitEventType(eventType string) (eventCategory, pureEventType string) {
typeList := strings.Split(eventType, "/") typeList := strings.Split(eventType, "/")
eventCategory = typeList[0] eventCategory = typeList[0]
if len(typeList) > 1 {
pureEventType = typeList[1] pureEventType = typeList[1]
} else {
globals.SugarLogger.Warnf("splitEventType eventType:%s", eventType)
}
return eventCategory, pureEventType return eventCategory, pureEventType
} }