From 4d67bd66b05ba73027994327286b70963e75e5e8 Mon Sep 17 00:00:00 2001 From: Tit Petric Date: Thu, 19 Jul 2018 20:20:43 +0200 Subject: [PATCH] upd(flags): configure from main fn not flags.go --- cmd/sam/flags.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/sam/flags.go b/cmd/sam/flags.go index 07a320506..e5e8c383a 100644 --- a/cmd/sam/flags.go +++ b/cmd/sam/flags.go @@ -3,8 +3,6 @@ package main import ( _ "github.com/joho/godotenv/autoload" "github.com/namsral/flag" - - "github.com/crusttech/crust/rbac" ) type configuration struct { @@ -12,7 +10,7 @@ type configuration struct { dbDSN string } -func flags(prefix string) configuration { +func flags(prefix string, mountFlags ...func()) configuration { var config configuration p := func(s string) string { @@ -21,7 +19,9 @@ func flags(prefix string) configuration { 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() + for _, mount := range mountFlags { + mount() + } flag.Parse() return config }