From 542369e83487cde929dc36804d0692a919841250 Mon Sep 17 00:00:00 2001 From: Marius Orcsik Date: Tue, 14 May 2024 13:38:34 +0200 Subject: [PATCH] Updated wrapper package --- app.go | 16 +++++----------- go.mod | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/app.go b/app.go index f7089bb..0c7b7f5 100644 --- a/app.go +++ b/app.go @@ -227,31 +227,25 @@ func (f *FedBOX) Run(c context.Context) error { defer f.stopFn() exit := w.RegisterSignalHandlers(w.SignalHandlers{ - syscall.SIGHUP: func(_ chan int) { + syscall.SIGHUP: func(_ chan<- int) { logger.Infof("SIGHUP received, reloading configuration") if err := f.reload(); err != nil { logger.Errorf("Failed: %+s", err.Error()) } }, - syscall.SIGINT: func(exit chan int) { + syscall.SIGINT: func(exit chan<- int) { logger.Infof("SIGINT received, stopping") exit <- 0 }, - syscall.SIGTERM: func(exit chan int) { + syscall.SIGTERM: func(exit chan<- int) { logger.Infof("SIGITERM received, force stopping") exit <- 0 }, - syscall.SIGQUIT: func(exit chan int) { + syscall.SIGQUIT: func(exit chan<- int) { logger.Infof("SIGQUIT received, force stopping with core-dump") exit <- 0 }, - }).Exec(func() error { - if err := srvRun(); err != nil { - logger.Errorf(err.Error()) - return err - } - return nil - }) + }).Exec(ctx, srvRun) if exit == 0 { logger.Infof("Shutting down") } diff --git a/go.mod b/go.mod index d0a8d0b..c587151 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,16 @@ module github.com/go-ap/fedbox -go 1.20 +go 1.21 require ( git.sr.ht/~mariusor/lw v0.0.0-20240323171419-d538df4af052 - git.sr.ht/~mariusor/wrapper v0.0.0-20240210113306-c862d947a747 + git.sr.ht/~mariusor/wrapper v0.0.0-20240514112730-225be473fdf4 github.com/go-ap/activitypub v0.0.0-20240408091739-ba76b44c2594 github.com/go-ap/auth v0.0.0-20240408093715-7b70def65ccb github.com/go-ap/cache v0.0.0-20240408093337-846e6272444d github.com/go-ap/client v0.0.0-20240408093509-f0721baa55c2 github.com/go-ap/errors v0.0.0-20240304112515-6077fa9c17b0 - github.com/go-ap/filters v0.0.0-20240408093433-6a48bb3dd711 + github.com/go-ap/filters v0.0.0-20240504174315-e65fd9aa38c4 github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 github.com/go-ap/processing v0.0.0-20240408154734-b62555dbaf98 github.com/go-ap/storage-badger v0.0.0-20240408155053-4b98c0bd6b3d @@ -22,12 +22,12 @@ require ( github.com/joho/godotenv v1.5.1 github.com/pborman/uuid v1.2.1 github.com/urfave/cli/v2 v2.25.7 - golang.org/x/crypto v0.22.0 + golang.org/x/crypto v0.23.0 ) require ( git.sr.ht/~mariusor/mask v0.0.0-20240327084502-ef2a9438457e // indirect - golang.org/x/oauth2 v0.19.0 // indirect + golang.org/x/oauth2 v0.20.0 // indirect ) require ( @@ -45,7 +45,7 @@ require ( github.com/google/flatbuffers v24.3.25+incompatible // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect - github.com/klauspost/compress v1.17.7 // indirect + github.com/klauspost/compress v1.17.8 // indirect github.com/mariusor/qstring v0.0.0-20200204164351-5a99d46de39d // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -59,18 +59,18 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - go.etcd.io/bbolt v1.3.9 // indirect + go.etcd.io/bbolt v1.3.10 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/term v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect - modernc.org/libc v1.49.3 // indirect + modernc.org/libc v1.50.5 // indirect modernc.org/mathutil v1.6.0 // indirect modernc.org/memory v1.8.0 // indirect - modernc.org/sqlite v1.29.5 // indirect + modernc.org/sqlite v1.29.9 // indirect modernc.org/strutil v1.2.0 // indirect modernc.org/token v1.1.0 // indirect ) -- 2.45.2