diff --git a/engine/load.go b/engine/load.go index d7f14132..9255118d 100644 --- a/engine/load.go +++ b/engine/load.go @@ -36,6 +36,7 @@ import ( func Load(cfg config.Config) (err error) { defer func() { err = exception.Catch(recover()) }() + exception.Mode = cfg.Mode // SET XGEN_BASE adminRoot := "yao" diff --git a/widgets/hook/hook.go b/widgets/hook/hook.go index 08952eab..baeff617 100644 --- a/widgets/hook/hook.go +++ b/widgets/hook/hook.go @@ -8,14 +8,14 @@ import ( // CopyBefore copy a before hook func CopyBefore(hook *Before, new *Before) { - if hook != nil { + if hook != nil && new != nil { *hook = *new } } // CopyAfter copy a after hook func CopyAfter(hook *After, new *After) { - if hook != nil { + if hook != nil && new != nil { *hook = *new } }