Formatting

configurable-file-paths
Robert Gerus 2015-11-10 00:14:05 +01:00
parent ef80bcd387
commit 1b328d0b0d
1 changed files with 25 additions and 25 deletions

View File

@ -59,40 +59,40 @@ func (c *Config) Lookup(context Context, key string) interface{} {
log.Println("Context:", context, "Looking up", key, "in", fpath)
value = lookupvar(key, fpath)
if value != nil {
log.Println("Context:", context, "Found", key, value)
log.Println("Context:", context, "Found", key, value)
return value
}
}
fpath = path.Join(c.ConfigDir, context.Network, context.Source+".json")
fpath = path.Join(c.ConfigDir, context.Network, context.Source+".json")
log.Println("Context:", context, "Looking up", key, "in", fpath)
value = lookupvar(key, fpath)
if value != nil {
log.Println("Context:", context, "Found", key, value)
return value
}
log.Println("Context:", context, "Looking up", key, "in", fpath)
value = lookupvar(key, fpath)
if value != nil {
log.Println("Context:", context, "Found", key, value)
return value
}
}
fpath = path.Join(c.ConfigDir, context.Network+".json")
fpath = path.Join(c.ConfigDir, context.Network+".json")
log.Println("Context:", context, "Looking up", key, "in", fpath)
value = lookupvar(key, fpath)
if value != nil {
log.Println("Context:", context, "Found", key, value)
return value
}
log.Println("Context:", context, "Looking up", key, "in", fpath)
value = lookupvar(key, fpath)
if value != nil {
log.Println("Context:", context, "Found", key, value)
return value
}
}
fpath = path.Join(c.ConfigDir, "common.json")
fpath = path.Join(c.ConfigDir, "common.json")
log.Println("Context:", context, "Looking up", key, "in", fpath)
value = lookupvar(key, fpath)
if value != nil {
log.Println("Context:", context, "Found", key, value)
return value
} else {
log.Println("Key", key, "not found")
return nil
}
log.Println("Context:", context, "Looking up", key, "in", fpath)
value = lookupvar(key, fpath)
if value != nil {
log.Println("Context:", context, "Found", key, value)
return value
} else {
log.Println("Key", key, "not found")
return nil
}
}