Implement optional namespace for server

This commit is contained in:
Bel LaPointe
2019-03-20 10:00:19 -06:00
parent b6baf90dc4
commit 73423064a8
5 changed files with 55 additions and 21 deletions

View File

@@ -10,12 +10,13 @@ var config Config
var lock = &sync.RWMutex{}
type Config struct {
db string
DB storage.DB
Port string
Addr string
Username string
Password string
db string
DB storage.DB
Port string
Addr string
Username string
Password string
DefaultNamespace string
}
func Values() Config {

View File

@@ -7,12 +7,14 @@ import (
func New() error {
config = Config{
db: orEnv(storage.MAP.String(), "DB", "DATABASE"),
Addr: orEnv("", "ADDR", "FILE"),
Username: orEnv("", "USER", "USERNAME"),
Password: orEnv("", "PASS", "PASSWORD"),
Port: orEnv("21412", "PORT", "LISTEN"),
db: orEnv(storage.MAP.String(), "DB", "DATABASE"),
Addr: orEnv("", "ADDR", "FILE"),
Username: orEnv("", "USER", "USERNAME"),
Password: orEnv("", "PASS", "PASSWORD"),
Port: orEnv("21412", "PORT", "LISTEN"),
DefaultNamespace: orEnv(storage.DefaultNamespace, "NS", "NAMESPACE"),
}
storage.DefaultNamespace = config.DefaultNamespace
DB, err := storage.New(storage.TypeFromString(config.db), config.Addr, config.Username, config.Password)
config.DB = DB
return err