Fix system events recursive triggering (#495)

serverless · Aug 2, 2018 · 8373e92 · 8373e92
1 parent fb79ad3
commit 8373e92
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/router/router.go b/router/router.go
@@ -451,6 +451,10 @@ func (router *Router) emitSystemEventReceived(path string, event eventpkg.Event,
 }
 
 func (router *Router) emitSystemFunctionInvoking(space string, functionID function.ID, event eventpkg.Event) error {
+	if event.IsSystem() {
+		return nil
+	}
+
 	system := eventpkg.New(
 		eventpkg.SystemFunctionInvokingType,
 		mimeJSON,
@@ -464,6 +468,10 @@ func (router *Router) emitSystemFunctionInvoking(space string, functionID functi
 }
 
 func (router *Router) emitSystemFunctionInvoked(space string, functionID function.ID, event eventpkg.Event, result []byte) error {
+	if event.IsSystem() {
+		return nil
+	}
+
 	system := eventpkg.New(
 		eventpkg.SystemFunctionInvokedType,
 		mimeJSON,
@@ -476,6 +484,10 @@ func (router *Router) emitSystemFunctionInvoked(space string, functionID functio
 }
 
 func (router *Router) emitSystemFunctionInvocationFailed(space string, functionID function.ID, event eventpkg.Event, err error) {
+	if event.IsSystem() {
+		return
+	}
+
 	if _, ok := err.(*function.ErrFunctionError); ok {
 		system := eventpkg.New(
 			eventpkg.SystemFunctionInvocationFailedType,