fix bug with r.Options.Config

nicola-spb · web-flow · commit 274aca0824bc · 2017-04-28T19:59:04.000+03:00
r.Options.Config always nil. https://github.com/gernest/utron/blob/master/router/routes.go#L362
diff --git a/app/app.go b/app/app.go
@@ -103,6 +103,7 @@ func (a *App) init() error {
 	if err != nil {
 		return err
 	}
+	a.Config = appConfig
 
 	views, err := view.NewSimpleView(appConfig.ViewsDir)
 	if err != nil {
@@ -128,8 +129,7 @@ func (a *App) init() error {
 	}
 
 	a.Router.Options = a.options()
-	a.Router.LoadRoutes(a.ConfigPath) // Load a routes file if available.
-	a.Config = appConfig
+	a.Router.LoadRoutes(a.ConfigPath) // Load a routes file if available.	
 	a.isInit = true
 
 	// In case the StaticDir is specified in the Config file, register

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ func (a *App) init() error {`
`103`	`103`	`if err != nil {`
`104`	`104`	`return err`
`105`	`105`	`}`
	`106`	`+ a.Config = appConfig`
`106`	`107`
`107`	`108`	`views, err := view.NewSimpleView(appConfig.ViewsDir)`
`108`	`109`	`if err != nil {`
`@@ -128,8 +129,7 @@ func (a *App) init() error {`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`a.Router.Options = a.options()`
`131`		`- a.Router.LoadRoutes(a.ConfigPath) // Load a routes file if available.`
`132`		`- a.Config = appConfig`
	`132`	`+ a.Router.LoadRoutes(a.ConfigPath) // Load a routes file if available.`
`133`	`133`	`a.isInit = true`
`134`	`134`
`135`	`135`	`// In case the StaticDir is specified in the Config file, register`