Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
andeya committed May 16, 2016
1 parent 2b6710a commit f399658
Showing 3 changed files with 24 additions and 12 deletions.
22 changes: 15 additions & 7 deletions config.go
Original file line number Diff line number Diff line change
@@ -234,14 +234,22 @@ func LoadDBConfig() (err error) {
iniconf, err := config.NewConfig("ini", fname)
if err == nil {
os.Remove(fname)
defDB := AppConfig.DBList["lessgo"]
for _, section := range iniconf.(*config.IniConfigContainer).Sections() {
dbconfig := defDB
readSingleConfig(section, &dbconfig, iniconf)
if strings.ToLower(section) == DEFAULTDB_SECTION {
AppConfig.DefaultDB = dbconfig.Name
sections := iniconf.(*config.IniConfigContainer).Sections()
if len(sections) > 0 {
AppConfig.DefaultDB = ""
defDB := AppConfig.DBList["lessgo"]
delete(AppConfig.DBList, "lessgo")
for _, section := range sections {
dbconfig := defDB
readSingleConfig(section, &dbconfig, iniconf)
if strings.ToLower(section) == DEFAULTDB_SECTION {
AppConfig.DefaultDB = dbconfig.Name
}
AppConfig.DBList[dbconfig.Name] = dbconfig
}
if AppConfig.DefaultDB == "" {
AppConfig.DefaultDB = iniconf.DefaultString(sections[0]+"::name", defDB.Name)
}
AppConfig.DBList[dbconfig.Name] = dbconfig
}
}

3 changes: 3 additions & 0 deletions config/ini.go
Original file line number Diff line number Diff line change
@@ -202,6 +202,7 @@ func (c *IniConfigContainer) MainKeys() []string {
a[i] = k
i++
}
sort.Strings(a)
return a
}

@@ -216,6 +217,7 @@ func (c *IniConfigContainer) Sections() []string {
a[i] = k
i++
}
sort.Strings(a)
return a
}

@@ -227,6 +229,7 @@ func (c *IniConfigContainer) SectionKeys(section string) []string {
a[i] = k
i++
}
sort.Strings(a)
return a
}

11 changes: 6 additions & 5 deletions virtrouter.go
Original file line number Diff line number Diff line change
@@ -53,11 +53,12 @@ var (

// 从数据库初始化虚拟路由
func initVirtRouterFromDB() {
lessgodb, _ = GetDB("lessgo")
if lessgodb == nil {
Logger().Warn("Can only use source code routing.")
return
}
defer func() {
if p := recover(); p != nil {
Logger().Warn("Can only use source code routing: %v.", p)
}
}()
lessgodb = DefaultDB()
var err error
if err = lessgodb.Ping(); err != nil {
Logger().Warn("Can only use source code routing: [dbPing] %v.", err)

0 comments on commit f399658

Please sign in to comment.