From 3fa7fc6e419eb426f2b111f6e6a62dfed929e9d3 Mon Sep 17 00:00:00 2001
From: fugr <fugr2012@gmail.com>
Date: Wed, 11 Jan 2017 18:55:53 +0800
Subject: [PATCH] config:fix handle include other.conf

When include other.conf,other.conf is either absolute directory or under beego in default temporary directory(/tmp/beego).
maybe replace by current directory is better.
---
 config/ini.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/ini.go b/config/ini.go
index 6b78f02a..c09bcf5c 100644
--- a/config/ini.go
+++ b/config/ini.go
@@ -54,10 +54,10 @@ func (ini *IniConfig) parseFile(name string) (*IniConfigContainer, error) {
 		return nil, err
 	}
 
-	return ini.parseData(data)
+	return ini.parseData(filepath.Dir(name), data)
 }
 
-func (ini *IniConfig) parseData(data []byte) (*IniConfigContainer, error) {
+func (ini *IniConfig) parseData(dir string, data []byte) (*IniConfigContainer, error) {
 	cfg := &IniConfigContainer{
 		data:           make(map[string]map[string]string),
 		sectionComment: make(map[string]string),
@@ -135,10 +135,6 @@ func (ini *IniConfig) parseData(data []byte) (*IniConfigContainer, error) {
 
 				otherfile := strings.Trim(includefiles[1], "\"")
 				if !filepath.IsAbs(otherfile) {
-					dir, err := os.Getwd()
-					if err != nil {
-						return nil, err
-					}
 					otherfile = filepath.Join(dir, otherfile)
 				}
 
@@ -187,8 +183,13 @@ func (ini *IniConfig) parseData(data []byte) (*IniConfigContainer, error) {
 }
 
 // ParseData parse ini the data
+// When include other.conf,other.conf is either absolute directory
+// or under beego in default temporary directory(/tmp/beego).
 func (ini *IniConfig) ParseData(data []byte) (Configer, error) {
-	return ini.parseData(data)
+	dir := filepath.Join(os.TempDir(), "beego")
+	os.MkdirAll(dir, os.ModePerm)
+
+	return ini.parseData(dir, data)
 }
 
 // IniConfigContainer A Config represents the ini configuration.