From 7cd900d61edbd6d322db3cecb913adf574389320 Mon Sep 17 00:00:00 2001 From: Jeff Halter <868228+jhalter@users.noreply.github.com> Date: Mon, 20 Jun 2022 20:14:32 -0700 Subject: Add initial support for resource and info forks --- cmd/mobius-hotline-server/main.go | 21 ++++++++++++++++++--- cmd/mobius-hotline-server/mobius/config/config.yaml | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go index 2f914c4..bf41da1 100644 --- a/cmd/mobius-hotline-server/main.go +++ b/cmd/mobius-hotline-server/main.go @@ -29,7 +29,22 @@ const ( func main() { rand.Seed(time.Now().UnixNano()) - ctx, cancelRoot := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(context.Background()) + + // TODO: implement graceful shutdown by closing context + // c := make(chan os.Signal, 1) + // signal.Notify(c, os.Interrupt) + // defer func() { + // signal.Stop(c) + // cancel() + // }() + // go func() { + // select { + // case <-c: + // cancel() + // case <-ctx.Done(): + // } + // }() basePort := flag.Int("bind", defaultPort, "Bind address and port") statsPort := flag.String("stats-port", "", "Enable stats HTTP endpoint on address and port") @@ -80,7 +95,7 @@ func main() { logger.Fatalw("Configuration directory not found", "path", configDir) } - srv, err := hotline.NewServer(*configDir, "", *basePort, logger, &hotline.OSFileStore{}) + srv, err := hotline.NewServer(*configDir, *basePort, logger, &hotline.OSFileStore{}) if err != nil { logger.Fatal(err) } @@ -99,7 +114,7 @@ func main() { } // Serve Hotline requests until program exit - logger.Fatal(srv.ListenAndServe(ctx, cancelRoot)) + logger.Fatal(srv.ListenAndServe(ctx, cancel)) } type statHandler struct { diff --git a/cmd/mobius-hotline-server/mobius/config/config.yaml b/cmd/mobius-hotline-server/mobius/config/config.yaml index a7a3ad9..380c39a 100644 --- a/cmd/mobius-hotline-server/mobius/config/config.yaml +++ b/cmd/mobius-hotline-server/mobius/config/config.yaml @@ -11,3 +11,4 @@ NewsDateFormat: "" MaxDownloads: 0 MaxDownloadsPerClient: 0 MaxConnectionsPerIP: 0 +PreserveResourceForks: true -- cgit