Added value object to be passed to the EventHandler

notzippy · notzippy · commit 580fdb81d773 · 2017-05-03T21:42:12.000-07:00
diff --git a/revel.go b/revel.go
@@ -46,7 +46,8 @@ type revelLogs struct {
 	c gocolorize.Colorize
 	w io.Writer
 }
-type EventHandler func(typeOf int) (responseOf int)
+
+type EventHandler func(typeOf int, value interface{}) (responseOf int)
 
 func (r *revelLogs) Write(p []byte) (n int, err error) {
 	return r.w.Write([]byte(r.c.Paint(string(p))))
@@ -242,23 +243,23 @@ func Init(mode, importPath, srcPath string) {
 	// However output settings can be controlled from app.conf
 	requestLog = getLogger("request")
 
-	fireEvent(REVEL_BEFORE_LOAD_MODULE)
+	fireEvent(REVEL_BEFORE_LOAD_MODULE, nil)
 	loadModules()
-	fireEvent(REVEL_AFTER_LOAD_MODULE)
+	fireEvent(REVEL_AFTER_LOAD_MODULE, nil)
 
 	Initialized = true
 	INFO.Printf("Initialized Revel v%s (%s) for %s", Version, BuildDate, MinimumGoVersion)
 }
 
 // Fires system events from revel
-func fireEvent(key int) (response int) {
+func fireEvent(key int, value interface{}) (response int) {
 	for _, handler := range initEventList {
-		response |= handler(key)
+		response |= handler(key, value)
 	}
 	return
 }
 
-// Add event handler to listen for system events
+// Add event handler to listen for all system events
 func AddInitEventHandler(handler EventHandler) {
 	initEventList = append(initEventList, handler)
 	return
diff --git a/server.go b/server.go
@@ -68,9 +68,9 @@ func Run(port int) {
 	// Create the CurrentEngine instance from the application config
 	InitServerEngine(port, Config.StringDefault("server.engine", GO_NATIVE_SERVER_ENGINE))
 	CurrentEngine.Event(ENGINE_EVENT_PREINIT, nil)
-	fireEvent(ENGINE_EVENT_PREINIT)
+	fireEvent(ENGINE_EVENT_PREINIT, nil)
 	InitServer()
-	fireEvent(ENGINE_EVENT_STARTUP)
+	fireEvent(ENGINE_EVENT_STARTUP, nil)
 	CurrentEngine.Event(ENGINE_EVENT_STARTUP, nil)
 	CurrentEngine.Start()
 	CurrentEngine.Event(ENGINE_EVENT_SHUTDOWN, nil)
diff --git a/template.go b/template.go
@@ -76,10 +76,12 @@ func (loader *TemplateLoader) Refresh() (err *Error) {
 	for _, engine := range loader.templatesAndEngineList {
 		engine.Event(TEMPLATE_REFRESH, nil)
 	}
+	fireEvent(TEMPLATE_REFRESH, nil)
 	defer func() {
 		for _, engine := range loader.templatesAndEngineList {
 			engine.Event(TEMPLATE_REFRESH_COMPLETE, nil)
 		}
+		fireEvent(TEMPLATE_REFRESH_COMPLETE, nil)
 	}()
 	// Resort the paths, make sure the revel path is the last path,
 	// so anything can override it

Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,12 @@ func (loader TemplateLoader) Refresh() (err Error) {`
`76`	`76`	`for _, engine := range loader.templatesAndEngineList {`
`77`	`77`	`engine.Event(TEMPLATE_REFRESH, nil)`
`78`	`78`	`}`
	`79`	`+ fireEvent(TEMPLATE_REFRESH, nil)`
`79`	`80`	`defer func() {`
`80`	`81`	`for _, engine := range loader.templatesAndEngineList {`
`81`	`82`	`engine.Event(TEMPLATE_REFRESH_COMPLETE, nil)`
`82`	`83`	`}`
	`84`	`+ fireEvent(TEMPLATE_REFRESH_COMPLETE, nil)`
`83`	`85`	`}()`
`84`	`86`	`// Resort the paths, make sure the revel path is the last path,`
`85`	`87`	`// so anything can override it`