Ivan/commento
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config_file.go: return error if config is invalid

Browse Source
This commit is contained in:
Adhityaa 2018-06-21 21:03:32 +05:30
parent 4890bc4cc7
commit bb24f62b9c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/config_file.go
View File

@ -14,8 +14,11 @@ func configFileLoad(filepath string) error {
defer file.Close() defer file.Close()
num := 0
scanner := bufio.NewScanner(file) scanner := bufio.NewScanner(file)
for scanner.Scan() { for scanner.Scan() {
num += 1
line := strings.TrimSpace(scanner.Text()) line := strings.TrimSpace(scanner.Text())
if line == "" { if line == "" {
continue continue
@ -27,7 +30,8 @@ func configFileLoad(filepath string) error {
i := strings.Index(line, "=") i := strings.Index(line, "=")
if i == -1 { if i == -1 {
continue logger.Errorf("%s: line %d: neither a comment nor a valid setting", filepath, num)
return errorInvalidConfigFile
} }
key := line[:i] key := line[:i]

1
api/errors.go
View File

@ -38,3 +38,4 @@ var errorNotADirectory = errors.New("The given path is not a directory.")
var errorGzip = errors.New("Cannot GZip content.") var errorGzip = errors.New("Cannot GZip content.")
var errorCannotDownloadDisqus = errors.New("We could not download your Disqus export file.") var errorCannotDownloadDisqus = errors.New("We could not download your Disqus export file.")
var errorSelfVote = errors.New("You cannot vote on your own comment.") var errorSelfVote = errors.New("You cannot vote on your own comment.")
var errorInvalidConfigFile = errors.New("Invalid config file.")