From 2b9903701a06e065a928f409db60bf9c40b398b1 Mon Sep 17 00:00:00 2001 From: Tit Petric Date: Tue, 17 Jul 2018 11:32:00 +0200 Subject: [PATCH] upd(main): restructure flags --- cmd/crm/flags.go | 10 +++++----- cmd/sam/flags.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/crm/flags.go b/cmd/crm/flags.go index 066674de4..07a320506 100644 --- a/cmd/crm/flags.go +++ b/cmd/crm/flags.go @@ -1,15 +1,15 @@ package main import ( - "github.com/namsral/flag" _ "github.com/joho/godotenv/autoload" + "github.com/namsral/flag" "github.com/crusttech/crust/rbac" ) type configuration struct { httpAddr string - dbDSN string + dbDSN string } func flags(prefix string) configuration { @@ -19,9 +19,9 @@ func flags(prefix string) configuration { return prefix + "-" + s } - flag.StringVar(&config.addr, p("http-addr"), ":3000", "Listen address for HTTP server") - flag.StringVar(&config.dsn, p("db-dsn"), "crust:crust@tcp(db1:3306)/crust?collation=utf8mb4_general_ci", "DSN for database connection") + flag.StringVar(&config.httpAddr, p("http-addr"), ":3000", "Listen address for HTTP server") + flag.StringVar(&config.dbDSN, p("db-dsn"), "crust:crust@tcp(db1:3306)/crust?collation=utf8mb4_general_ci", "DSN for database connection") rbac.Flags() flag.Parse() return config -} \ No newline at end of file +} diff --git a/cmd/sam/flags.go b/cmd/sam/flags.go index 066674de4..07a320506 100644 --- a/cmd/sam/flags.go +++ b/cmd/sam/flags.go @@ -1,15 +1,15 @@ package main import ( - "github.com/namsral/flag" _ "github.com/joho/godotenv/autoload" + "github.com/namsral/flag" "github.com/crusttech/crust/rbac" ) type configuration struct { httpAddr string - dbDSN string + dbDSN string } func flags(prefix string) configuration { @@ -19,9 +19,9 @@ func flags(prefix string) configuration { return prefix + "-" + s } - flag.StringVar(&config.addr, p("http-addr"), ":3000", "Listen address for HTTP server") - flag.StringVar(&config.dsn, p("db-dsn"), "crust:crust@tcp(db1:3306)/crust?collation=utf8mb4_general_ci", "DSN for database connection") + flag.StringVar(&config.httpAddr, p("http-addr"), ":3000", "Listen address for HTTP server") + flag.StringVar(&config.dbDSN, p("db-dsn"), "crust:crust@tcp(db1:3306)/crust?collation=utf8mb4_general_ci", "DSN for database connection") rbac.Flags() flag.Parse() return config -} \ No newline at end of file +}