Skip to content

B
beego
Commit ffbb45e5 authored by ysqi's avatar ysqi
Browse files
Options

Revert "ignore parse include config file error" 

This reverts commit 891016a0.
parent 891016a0
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
config/ini.go
View file @ ffbb45e5
...@@ -21,7 +21,6 @@ import ( ...@@ -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) { ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment