enable single servers with cli/client

This commit is contained in:
Bel LaPointe
2019-04-23 18:55:48 -06:00
parent aa1fdd367d
commit f912272912
3 changed files with 37 additions and 23 deletions

View File

@@ -1,18 +1,29 @@
package config
import (
"local/args"
"local/storage"
"os"
)
func New() error {
as := args.NewArgSet()
as.Append(args.STRING, "addr", "address/path to database/file", "")
as.Append(args.STRING, "user", "username to database", "")
as.Append(args.STRING, "pass", "password to database", "")
as.Append(args.STRING, "port", "port to listen on", "21412")
as.Append(args.STRING, "db", "database type code", storage.MAP.String())
as.Append(args.STRING, "ns", "namespace", storage.DefaultNamespace)
if err := as.Parse(); err != nil {
return err
}
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"),
DefaultNamespace: orEnv(storage.DefaultNamespace, "NS", "NAMESPACE"),
db: as.Get("db").GetString(),
Addr: as.Get("addr").GetString(),
Username: as.Get("user").GetString(),
Password: as.Get("pass").GetString(),
Port: as.Get("port").GetString(),
DefaultNamespace: as.Get("ns").GetString(),
}
storage.DefaultNamespace = config.DefaultNamespace
DB, err := storage.New(storage.TypeFromString(config.db), config.Addr, config.Username, config.Password)