barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Destutter cayley/config

Browse source
This commit is contained in:
kortschak 2014-06-28 12:42:15 +09:30
parent c4a19a4e35
commit 388618bfa7
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/config.go
View file

@ -22,7 +22,7 @@ import (
"github.com/barakmich/glog"
)
type CayleyConfig struct {
type Config struct {
DatabaseType string `json:"database"`
DatabasePath string `json:"db_path"`
DatabaseOptions map[string]interface{} `json:"db_options"`
@ -41,8 +41,8 @@ var port = flag.String("port", "64210", "Port to listen on.")
var readOnly = flag.Bool("read_only", false, "Disable writing via HTTP.")
var gremlinTimeout = flag.Int("gremlin_timeout", 30, "Number of seconds until an individual query times out.")
func ParseConfigFromFile(filename string) *CayleyConfig {
config := &CayleyConfig{}
func ParseConfigFromFile(filename string) *Config {
config := &Config{}
if filename == "" {
return config
}
@ -61,7 +61,7 @@ func ParseConfigFromFile(filename string) *CayleyConfig {
return config
}
func ParseConfigFromFlagsAndFile(fileFlag string) *CayleyConfig {
func ParseConfigFromFlagsAndFile(fileFlag string) *Config {
// Find the file...
var trueFilename string
if fileFlag != "" {