From 9b5b6a3d8f41215ddced082b282e467af41d7b59 Mon Sep 17 00:00:00 2001 From: Jordan Orelli Date: Mon, 6 Dec 2021 20:09:46 -0600 Subject: [PATCH] cleaning some stuff up --- main.go | 27 --------------------------- serve.go | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 serve.go diff --git a/main.go b/main.go index 1b3677e..ef86036 100644 --- a/main.go +++ b/main.go @@ -8,9 +8,6 @@ import ( "log" "os" "os/signal" - - "orel.li/modularium/internal/index" - "orel.li/modularium/internal/ref" ) var log_error = log.New(os.Stderr, "", 0) @@ -41,30 +38,6 @@ func sigCancel(ctx context.Context) context.Context { return ctx } -func serve(args []string) { - path := "./modularium.sock" - indexPath := pathArg{path: "./modules-index.json"} - - serveFlags := flag.NewFlagSet("serve", flag.ExitOnError) - serveFlags.StringVar(&path, "l", path, "path for a unix domain socket to listen on") - serveFlags.Var(&indexPath, "index", "an index config") - serveFlags.Parse(args) - - idx, err := index.Load(indexPath.path) - if err != nil { - shutdown(err) - } - log_info.Printf("index: %v", idx) - - h := handler{ - path: ref.New(&path), - index: ref.New(&indexPath), - } - if err := h.run(); err != nil { - bail(1, err.Error()) - } -} - func main() { sigCancel(context.Background()) root := flag.NewFlagSet("", flag.ExitOnError) diff --git a/serve.go b/serve.go new file mode 100644 index 0000000..794c54e --- /dev/null +++ b/serve.go @@ -0,0 +1,32 @@ +package main + +import ( + "flag" + + "orel.li/modularium/internal/index" + "orel.li/modularium/internal/ref" +) + +func serve(args []string) { + path := "./modularium.sock" + indexPath := pathArg{path: "./modules-index.json"} + + serveFlags := flag.NewFlagSet("serve", flag.ExitOnError) + serveFlags.StringVar(&path, "l", path, "path for a unix domain socket to listen on") + serveFlags.Var(&indexPath, "index", "an index config") + serveFlags.Parse(args) + + idx, err := index.Load(indexPath.path) + if err != nil { + shutdown(err) + } + log_info.Printf("index: %v", idx) + + h := handler{ + path: ref.New(&path), + index: ref.New(&indexPath), + } + if err := h.run(); err != nil { + bail(1, err.Error()) + } +}