rename Catnip to Run and add context param

noriah · Dec 24, 2022 · 88e8871 · 88e8871
1 parent 1ba7db1
commit 88e8871
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/catnip.go b/catnip.go
@@ -14,7 +14,7 @@ type SetupFunc func() error
 type StartFunc func(ctx context.Context) (context.Context, error)
 type CleanupFunc func() error
 
-func Catnip(cfg *Config) error {
+func Run(cfg *Config, ctx context.Context) error {
 	if err := cfg.Validate(); err != nil {
 		return err
 	}
@@ -77,10 +77,6 @@ func Catnip(cfg *Config) error {
 		defer cfg.CleanupFunc()
 	}
 
-	// Root Context
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
 	if cfg.StartFunc != nil {
 		if ctx, err = cfg.StartFunc(ctx); err != nil {
 			return err

diff --git a/cmd/catnip/main.go b/cmd/catnip/main.go
@@ -87,7 +87,11 @@ func main() {
 		}),
 	}
 
-	chk(catnip.Catnip(&catnipCfg), "failed to run catnip")
+	// Root Context
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	chk(catnip.Run(&catnipCfg, ctx), "failed to run catnip")
 }
 
 func doFlags(cfg *config) bool {