From f5a875b7430e7c1e470125478a2f1a5e738e9bd5 Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Sun, 18 Jan 2015 17:55:18 +0700 Subject: [PATCH] Change setup function name --- demo/demo.go | 6 ++++-- manager.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/demo/demo.go b/demo/demo.go index f2cb5af..454ec98 100644 --- a/demo/demo.go +++ b/demo/demo.go @@ -23,10 +23,12 @@ type ( } ) -func main() { - confection.Setup() +func init() { + confection.SetupFlags() flag.Parse() +} +func main() { conf := Config{ DatabaseConfig: DatabaseConfig{}, } diff --git a/manager.go b/manager.go index be3aa45..ff3cf8e 100644 --- a/manager.go +++ b/manager.go @@ -18,7 +18,7 @@ var ( serverPort int ) -func Setup() { +func SetupFlags() { flag.StringVar(&configPath, "config", "config.json", "Path to config file") flag.IntVar(&serverPort, "config-port", 5050, "Config manager http port") }