gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow default flags to override config file

Browse Source
This commit is contained in:
Derek Collison
2013-10-16 08:00:12 -07:00
parent 2ebad0f182
commit 3c050273bd
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gnatsd.go
View File

@@ -21,11 +21,11 @@ func main() {
var configFile string
// Parse flags
flag.IntVar(&opts.Port, "port", server.DEFAULT_PORT, "Port to listen on.")
flag.IntVar(&opts.Port, "p", server.DEFAULT_PORT, "Port to listen on.")
flag.StringVar(&opts.Host, "addr", server.DEFAULT_HOST, "Network host to listen on.")
flag.StringVar(&opts.Host, "a", server.DEFAULT_HOST, "Network host to listen on.")
flag.StringVar(&opts.Host, "net", server.DEFAULT_HOST, "Network host to listen on.")
flag.IntVar(&opts.Port, "port", 0, "Port to listen on.")
flag.IntVar(&opts.Port, "p", 0, "Port to listen on.")
flag.StringVar(&opts.Host, "addr", "", "Network host to listen on.")
flag.StringVar(&opts.Host, "a", "", "Network host to listen on.")
flag.StringVar(&opts.Host, "net", "", "Network host to listen on.")
flag.BoolVar(&opts.Debug, "D", false, "Enable Debug logging.")
flag.BoolVar(&opts.Debug, "debug", false, "Enable Debug logging.")
flag.BoolVar(&opts.Trace, "V", false, "Enable Trace logging.")
@@ -73,20 +73,18 @@ func main() {
}
}
var fileOpts *server.Options
var err error
// Parse config if given
if configFile != "" {
fileOpts, err = server.ProcessConfigFile(configFile)
fileOpts, err := server.ProcessConfigFile(configFile)
if err != nil {
server.PrintAndDie(err.Error())
}
opts = *server.MergeOptions(fileOpts, &opts)
}
// Create the server with appropriate options.
s := server.New(server.MergeOptions(fileOpts, &opts))
s := server.New(&opts)
// Start things up. Block here til done.
// Start things up. Block here until done.
s.Start()
}