diff options
Diffstat (limited to 'cmd/server/main.go')
-rw-r--r-- | cmd/server/main.go | 63 |
1 files changed, 27 insertions, 36 deletions
diff --git a/cmd/server/main.go b/cmd/server/main.go index 51a9e52..be36e3b 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -1,21 +1,16 @@ package main import ( + "context" "fmt" "os" "os/signal" - "sync" - "website/internal/log" - "website/internal/server" + "go.alanpearce.eu/website/internal/server" + "go.alanpearce.eu/x/log" "github.com/ardanlabs/conf/v3" - "github.com/pkg/errors" -) - -var ( - CommitSHA string - ShortSHA string + "gitlab.com/tozd/go/errors" ) func main() { @@ -28,45 +23,41 @@ func main() { } panic("parsing runtime configuration" + err.Error()) } - log.Configure(!runtimeConfig.Development) + log := log.Configure(!runtimeConfig.Development) + + if listenAddress := runtimeConfig.ListenAddress; listenAddress[0] == '[' { + runtimeConfig.ListenAddress = listenAddress[1 : len(listenAddress)-1] + } if runtimeConfig.Development { tmpdir, err := os.MkdirTemp("", "website") if err != nil { - log.Fatal("could not create temporary directory to build website: %v", err) + log.Fatal("could not create temporary directory", "error", err) } - runtimeConfig.Root = tmpdir defer os.RemoveAll(tmpdir) + runtimeConfig.Root = tmpdir } - c := make(chan os.Signal, 2) - signal.Notify(c, os.Interrupt) - sv, err := server.New(&runtimeConfig) + sv, err := server.New(&runtimeConfig, log) if err != nil { - log.Fatal("error setting up server", "error", err) + log.Error("could not create server", "error", err) + + return } - wg := &sync.WaitGroup{} - wg.Add(1) - go func() { - defer wg.Done() - sig := <-c - log.Info("signal captured", "sig", sig) - <-sv.Stop() - log.Debug("server stopped") - }() - sErr := make(chan error) - wg.Add(1) + ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt) + defer cancel() + go func() { - defer wg.Done() - sErr <- sv.Start() + err = sv.Start() + if err != nil { + // Error starting or closing listener: + log.Fatal("error %v", err) + } }() - log.Info("server listening", "address", sv.Addr) - err = <-sErr - if err != nil { - // Error starting or closing listener: - log.Fatal("error", "error", err) - } - wg.Wait() + <-ctx.Done() + log.Debug("calling stop") + sv.Stop() + log.Debug("done") } |