refactor code for context fallthrough

middleware/jwt/jwt.go

@@ -19,7 +19,6 @@ import (
 	"github.com/sot-tech/mochi/middleware"
 	"github.com/sot-tech/mochi/pkg/conf"
 	"github.com/sot-tech/mochi/pkg/log"
-	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
 )
 
@@ -110,13 +109,12 @@ func build(config conf.MapConfig, _ storage.PeerStorage) (h middleware.Hook, err
 	return
 }
 
-func (h *hook) Stop() stop.Result {
+func (h *hook) Close() error {
 	logger.Debug().Msg("attempting to shutdown JWT middleware")
-	c := make(stop.Channel)
 	if h.jwks != nil {
-		go h.jwks.EndBackground()
+		h.jwks.EndBackground()
 	}
-	return c.Result()
+	return nil
 }
 
 type verifiableClaims interface {

middleware/logic.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/sot-tech/mochi/bittorrent"
-	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
 )
 
@@ -119,25 +118,3 @@ func (l *Logic) Ping(ctx context.Context) (err error) {
 	}
 	return
 }
-
-// Stop stops the Logic.
-//
-// This stops any hooks that implement stop.Stopper.
-func (l *Logic) Stop() stop.Result {
-	stopGroup := stop.NewGroup()
-	for _, hook := range l.preHooks {
-		stoppable, ok := hook.(stop.Stopper)
-		if ok {
-			stopGroup.Add(stoppable)
-		}
-	}
-
-	for _, hook := range l.postHooks {
-		stoppable, ok := hook.(stop.Stopper)
-		if ok {
-			stopGroup.Add(stoppable)
-		}
-	}
-
-	return stopGroup.Stop()
-}

middleware/torrentapproval/container/directory/directory.go

@@ -17,7 +17,6 @@ import (
 	"github.com/sot-tech/mochi/middleware/torrentapproval/container/list"
 	"github.com/sot-tech/mochi/pkg/conf"
 	"github.com/sot-tech/mochi/pkg/log"
-	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
 )
 
@@ -49,11 +48,6 @@ func build(conf conf.MapConfig, st storage.DataStorage) (container.Container, er
 		},
 		watcher: nil,
 	}
-	var w *dirwatch.Instance
-	if w, err = dirwatch.New(c.Path); err != nil {
-		return nil, fmt.Errorf("unable to initialize directory watch: %w", err)
-	}
-	d.watcher = w
 	if len(d.StorageCtx) == 0 {
 		logger.Warn().
 			Str("name", "StorageCtx").
@@ -62,6 +56,11 @@ func build(conf conf.MapConfig, st storage.DataStorage) (container.Container, er
 			Msg("falling back to default configuration")
 		d.StorageCtx = container.DefaultStorageCtxName
 	}
+	var w *dirwatch.Instance
+	if w, err = dirwatch.New(c.Path); err != nil {
+		return nil, fmt.Errorf("unable to initialize directory watch: %w", err)
+	}
+	d.watcher = w
 	go func() {
 		for event := range d.watcher.Events {
 			var mi *metainfo.MetaInfo
@@ -124,10 +123,10 @@ type directory struct {
 	watcher *dirwatch.Instance
 }
 
-// Stop closes watching of torrent directory
-func (d *directory) Stop() stop.Result {
-	st := make(stop.Channel)
-	d.watcher.Close()
-	st.Done()
-	return st.Result()
+// Close closes watching of torrent directory
+func (d *directory) Close() error {
+	if d.watcher != nil {
+		d.watcher.Close()
+	}
+	return nil
 }

middleware/torrentapproval/torrentapproval.go

@@ -5,6 +5,7 @@ package torrentapproval
 import (
 	"context"
 	"fmt"
+	"io"
 
 	"github.com/sot-tech/mochi/bittorrent"
 	"github.com/sot-tech/mochi/middleware"
@@ -17,7 +18,6 @@ import (
 
 	// import static list to enable appropriate support
 	_ "github.com/sot-tech/mochi/middleware/torrentapproval/container/list"
-	"github.com/sot-tech/mochi/pkg/stop"
 	"github.com/sot-tech/mochi/storage"
 )
 
@@ -86,9 +86,9 @@ func (h *hook) HandleScrape(ctx context.Context, _ *bittorrent.ScrapeRequest, _
 	return ctx, nil
 }
 
-func (h *hook) Stop() stop.Result {
-	if st, isOk := h.hashContainer.(stop.Stopper); isOk {
-		return st.Stop()
+func (h *hook) Close() (err error) {
+	if cl, isOk := h.hashContainer.(io.Closer); isOk {
+		err = cl.Close()
 	}
-	return stop.AlreadyStopped
+	return err
 }