2 files changed, 24 insertions(+), 23 deletions(-)
M app.go
M go.mod
M app.go => app.go +11 -10
@@ 226,30 226,31 @@ func (f *FedBOX) Run(c context.Context) error {
}
defer f.stopFn()
- exit := w.RegisterSignalHandlers(w.SignalHandlers{
- syscall.SIGHUP: func(_ chan<- int) {
+ err := w.RegisterSignalHandlers(w.SignalHandlers{
+ syscall.SIGHUP: func(_ chan<- error) {
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<- error) {
logger.Infof("SIGINT received, stopping")
- exit <- 0
+ exit <- nil
},
- syscall.SIGTERM: func(exit chan<- int) {
+ syscall.SIGTERM: func(exit chan<- error) {
logger.Infof("SIGITERM received, force stopping")
- exit <- 0
+ exit <- nil
},
- syscall.SIGQUIT: func(exit chan<- int) {
+ syscall.SIGQUIT: func(exit chan<- error) {
logger.Infof("SIGQUIT received, force stopping with core-dump")
- exit <- 0
+ cancelFn()
+ exit <- nil
},
}).Exec(ctx, srvRun)
- if exit == 0 {
+ if err == nil {
logger.Infof("Shutting down")
}
- return nil
+ return err
}
func (f *FedBOX) infFn(s string, p ...any) {
M go.mod => go.mod +13 -13
@@ 4,7 4,7 @@ go 1.21
require (
git.sr.ht/~mariusor/lw v0.0.0-20240323171419-d538df4af052
- git.sr.ht/~mariusor/wrapper v0.0.0-20240514112730-225be473fdf4
+ git.sr.ht/~mariusor/wrapper v0.0.0-20240519120935-f877e4d97def
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
@@ 17,17 17,17 @@ require (
github.com/go-ap/storage-boltdb v0.0.0-20240408155023-44d05a4f8f55
github.com/go-ap/storage-fs v0.0.0-20240408094148-b3bc562af831
github.com/go-ap/storage-sqlite v0.0.0-20240408155002-b9609c5c7d14
- github.com/go-chi/chi/v5 v5.0.12
+ github.com/go-chi/chi/v5 v5.1.0
github.com/go-fed/httpsig v1.1.0
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.23.0
+ golang.org/x/crypto v0.25.0
)
require (
git.sr.ht/~mariusor/mask v0.0.0-20240327084502-ef2a9438457e // indirect
- golang.org/x/oauth2 v0.20.0 // indirect
+ golang.org/x/oauth2 v0.21.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.8 // indirect
+ github.com/klauspost/compress v1.17.9 // 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
@@ 55,22 55,22 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rs/xid v1.5.0 // indirect
- github.com/rs/zerolog v1.32.0 // indirect
+ github.com/rs/zerolog v1.33.0 // indirect
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.10 // indirect
go.opencensus.io v0.24.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
+ golang.org/x/net v0.27.0 // indirect
+ golang.org/x/sys v0.22.0 // indirect
+ golang.org/x/term v0.22.0 // indirect
+ golang.org/x/text v0.16.0 // indirect
+ google.golang.org/protobuf v1.34.2 // indirect
modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
- modernc.org/libc v1.50.5 // indirect
+ modernc.org/libc v1.54.3 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.8.0 // indirect
- modernc.org/sqlite v1.29.9 // indirect
+ modernc.org/sqlite v1.30.1 // indirect
modernc.org/strutil v1.2.0 // indirect
modernc.org/token v1.1.0 // indirect
)