From 436df7b2b4475b8bab0b05efc724fffb9c9b101e Mon Sep 17 00:00:00 2001 From: Winni Neessen Date: Fri, 15 Dec 2023 17:35:27 +0100 Subject: [PATCH] Refactor signal handling and remove SPDX licensing details Redid signal handling in the main server code leading to simpler, more readable code. Removed the SPDX license identifiers from 'go.sum' following recent policy changes. --- cmd/server/main.go | 45 +++++++++++++++++++++------------------------ go.sum | 4 ---- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 6ab704d..9edab98 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -45,31 +45,28 @@ func main() { sc := make(chan os.Signal, 1) signal.Notify(sc) - for { - select { - case rc := <-sc: - if rc == syscall.SIGKILL || rc == syscall.SIGABRT || rc == syscall.SIGINT || rc == syscall.SIGTERM { - l.Warn("received signal. shutting down server", slog.String("signal", rc.String())) - //s.Stop() - l.Info("server gracefully shut down") - os.Exit(0) - } - if rc == syscall.SIGHUP { - l.Info(`received "SIGHUP" signal - reloading rules...`) - /* - _, nr, err := config.New(config.WithConfFile(*cf), config.WithRulesFile(*rf)) - if err != nil { - s.Log.Errorf("%s - skipping reload", err) - continue - } - if err := nr.CheckRegEx(); err != nil { - s.Log.Errorf("ruleset validation failed for new ruleset - skipping reload: %s", err) - continue - } - s.SetRules(nr) + for rc := range sc { + if rc == syscall.SIGKILL || rc == syscall.SIGABRT || rc == syscall.SIGINT || rc == syscall.SIGTERM { + l.Warn("received signal. shutting down server", slog.String("signal", rc.String())) + // s.Stop() + l.Info("server gracefully shut down") + os.Exit(0) + } + if rc == syscall.SIGHUP { + l.Info(`received "SIGHUP" signal - reloading rules...`) + /* + _, nr, err := config.New(config.WithConfFile(*cf), config.WithRulesFile(*rf)) + if err != nil { + s.Log.Errorf("%s - skipping reload", err) + continue + } + if err := nr.CheckRegEx(); err != nil { + s.Log.Errorf("ruleset validation failed for new ruleset - skipping reload: %s", err) + continue + } + s.SetRules(nr) - */ - } + */ } } } diff --git a/go.sum b/go.sum index 8ea5e77..0157e46 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 Winni Neessen -// -// SPDX-License-Identifier: MIT - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=