From 73c27f6bddac327d580c920da9523a6412792bcc Mon Sep 17 00:00:00 2001 From: Tit Petric Date: Thu, 19 Jul 2018 20:21:18 +0200 Subject: [PATCH] upd(sam main): pass flags in main, add ws routes --- cmd/sam/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/sam/main.go b/cmd/sam/main.go index dc1f742d4..fb3a14ed9 100644 --- a/cmd/sam/main.go +++ b/cmd/sam/main.go @@ -9,7 +9,9 @@ import ( "github.com/go-chi/chi" + "github.com/crusttech/crust/rbac" "github.com/crusttech/crust/sam/rest" + "github.com/crusttech/crust/sam/websocket" "github.com/titpetric/factory" ) @@ -23,7 +25,7 @@ func handleError(err error, message string) { } func main() { - config := flags("sam") + config := flags("sam", rbac.Flags, websocket.Flags) // log to stdout not stderr log.SetOutput(os.Stdout) @@ -45,6 +47,6 @@ func main() { // mount routes r := chi.NewRouter() - MountRoutes(r, routeOptions, rest.MountRoutes) + MountRoutes(r, routeOptions, rest.MountRoutes, websocket.MountRoutes) http.Serve(listener, r) }