1
0
mirror of https://github.com/astaxie/beego.git synced 2024-06-30 16:54:14 +00:00

Revert "ignore parse include config file error"

This reverts commit 891016a0a2.
This commit is contained in:
ysqi 2016-02-27 20:18:59 +08:00
parent 891016a0a2
commit ffbb45e567

View File

@ -21,7 +21,6 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"path" "path"
"strconv" "strconv"
@ -135,9 +134,7 @@ func (ini *IniConfig) parseFile(name string) (*IniConfigContainer, error) {
} }
i, err := ini.parseFile(otherfile) i, err := ini.parseFile(otherfile)
if err != nil { if err != nil {
// ignore error return nil, err
log.Printf("[warn] handle config %q error, %s \n", key, err.Error())
continue
} }
for sec, dt := range i.data { for sec, dt := range i.data {
if _, ok := cfg.data[sec]; !ok { if _, ok := cfg.data[sec]; !ok {