mirror of
https://github.com/astaxie/beego.git
synced 2024-12-23 14:10:50 +00:00
config: fix the import issue
This commit is contained in:
parent
af7ac98bd6
commit
10d2c7c328
@ -14,6 +14,7 @@ import (
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/astaxie/beego/config"
|
||||
"github.com/beego/x2j"
|
||||
)
|
||||
|
||||
@ -24,7 +25,7 @@ type XMLConfig struct {
|
||||
}
|
||||
|
||||
// Parse returns a ConfigContainer with parsed xml config map.
|
||||
func (xmls *XMLConfig) Parse(filename string) (ConfigContainer, error) {
|
||||
func (xmls *XMLConfig) Parse(filename string) (config.ConfigContainer, error) {
|
||||
file, err := os.Open(filename)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -101,5 +102,5 @@ func (c *XMLConfigContainer) DIY(key string) (v interface{}, err error) {
|
||||
}
|
||||
|
||||
func init() {
|
||||
Register("xml", &XMLConfig{})
|
||||
config.Register("xml", &XMLConfig{})
|
||||
}
|
||||
|
@ -9,6 +9,8 @@ package config
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/astaxie/beego/config"
|
||||
)
|
||||
|
||||
//xml parse should incluce in <config></config> tags
|
||||
@ -36,7 +38,7 @@ func TestXML(t *testing.T) {
|
||||
}
|
||||
f.Close()
|
||||
defer os.Remove("testxml.conf")
|
||||
xmlconf, err := NewConfig("xml", "testxml.conf")
|
||||
xmlconf, err := config.NewConfig("xml", "testxml.conf")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
@ -16,6 +16,7 @@ import (
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/astaxie/beego/config"
|
||||
"github.com/beego/goyaml2"
|
||||
)
|
||||
|
||||
@ -24,7 +25,7 @@ type YAMLConfig struct {
|
||||
}
|
||||
|
||||
// Parse returns a ConfigContainer with parsed yaml config map.
|
||||
func (yaml *YAMLConfig) Parse(filename string) (ConfigContainer, error) {
|
||||
func (yaml *YAMLConfig) Parse(filename string) (config.ConfigContainer, error) {
|
||||
y := &YAMLConfigContainer{
|
||||
data: make(map[string]interface{}),
|
||||
}
|
||||
@ -146,5 +147,5 @@ func (c *YAMLConfigContainer) DIY(key string) (v interface{}, err error) {
|
||||
}
|
||||
|
||||
func init() {
|
||||
Register("yaml", &YAMLConfig{})
|
||||
config.Register("yaml", &YAMLConfig{})
|
||||
}
|
||||
|
@ -9,6 +9,8 @@ package config
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/astaxie/beego/config"
|
||||
)
|
||||
|
||||
var yamlcontext = `
|
||||
@ -33,7 +35,7 @@ func TestYaml(t *testing.T) {
|
||||
}
|
||||
f.Close()
|
||||
defer os.Remove("testyaml.conf")
|
||||
yamlconf, err := NewConfig("yaml", "testyaml.conf")
|
||||
yamlconf, err := config.NewConfig("yaml", "testyaml.conf")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user