From d5f07d65bb55f6b77390ec4aa1da5229d28653b9 Mon Sep 17 00:00:00 2001
From: ysqi <devysq@gmail.com>
Date: Sun, 14 Feb 2016 18:54:40 +0800
Subject: [PATCH 1/3] panic parse config error

---
 config.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config.go b/config.go
index ffe92f06..92fb8914 100644
--- a/config.go
+++ b/config.go
@@ -193,7 +193,9 @@ func init() {
 		return
 	}
 
-	parseConfig(appConfigPath)
+	if err := parseConfig(appConfigPath); err != nil {
+		panic(err)
+	}
 }
 
 // now only support ini, next will support json.

From 891016a0a25cdda21b119d07972bddf0a2f995ea Mon Sep 17 00:00:00 2001
From: ysqi <devysq@gmail.com>
Date: Sun, 14 Feb 2016 18:55:42 +0800
Subject: [PATCH 2/3] ignore parse include config file error

---
 config/ini.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

From ffbb45e567a7616540f0dfdfaeeeffd7617b53d4 Mon Sep 17 00:00:00 2001
From: ysqi <devysq@gmail.com>
Date: Sat, 27 Feb 2016 20:18:59 +0800
Subject: [PATCH 3/3] Revert "ignore parse include config file error"

This reverts commit 891016a0a25cdda21b119d07972bddf0a2f995ea.
---
 config/ini.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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