summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--go.mod1
-rw-r--r--go.sum12
-rw-r--r--main.go7
3 files changed, 5 insertions, 15 deletions
diff --git a/go.mod b/go.mod
index 5187c20..4734707 100644
--- a/go.mod
+++ b/go.mod
@@ -6,5 +6,4 @@ require (
github.com/gorilla/mux v1.8.0
golang.org/x/sync v0.1.0
olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3
- sigs.k8s.io/controller-runtime v0.13.1
)
diff --git a/go.sum b/go.sum
index 8762969..650c076 100644
--- a/go.sum
+++ b/go.sum
@@ -1,18 +1,6 @@
-github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU=
olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 h1:slmdOY3vp8a7KQbHkL+FLbvbkgMqmXojpFUO/jENuqQ=
olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3/go.mod h1:oVgVk4OWVDi43qWBEyGhXgYxt7+ED4iYNpTngSLX2Iw=
-sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
-sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
diff --git a/main.go b/main.go
index 3c123d2..4546ede 100644
--- a/main.go
+++ b/main.go
@@ -4,12 +4,14 @@
package main
import (
+ "context"
"flag"
"log/slog"
"net"
"net/http"
"net/http/pprof"
"os"
+ "os/signal"
"strconv"
"time"
@@ -18,7 +20,6 @@ import (
"go.terinstock.com/cgit-httpd/handlers/git"
"go.terinstock.com/cgit-httpd/manager"
"go.terinstock.com/cgit-httpd/server"
- "sigs.k8s.io/controller-runtime/pkg/manager/signals"
)
var configFile string
@@ -89,7 +90,9 @@ func main() {
})
}
- if err := m.Start(signals.SetupSignalHandler()); err != nil {
+ ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+ defer cancel()
+ if err := m.Start(ctx); err != nil {
logger.Info("manager stopped", "error", err)
}
}