Fix ctx issues

infogulch · Mar 11, 2024 · df4cd8b · df4cd8b
1 parent e91291c
commit df4cd8b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/instance.go b/instance.go
@@ -182,8 +182,7 @@ var nextInstanceIdentity atomic.Int64
 
 type xinstance struct {
 	Config
-	id  int64
-	ctx context.Context
+	id int64
 
 	stats  InstanceStats
 	routes []InstanceRoute
@@ -215,7 +214,7 @@ var (
 
 func (server *xinstance) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	select {
-	case <-server.ctx.Done():
+	case <-server.Ctx.Done():
 		server.Logger.Error("received request after xtemplate instance cancelled", slog.String("method", r.Method), slog.String("path", r.URL.Path))
 		http.Error(w, "server stopped", http.StatusInternalServerError)
 		return

diff --git a/server.go b/server.go
@@ -89,12 +89,12 @@ func (x *xserver) Reload() error {
 	}
 
 	var newcancel func()
-	x.config.Ctx, newcancel = context.WithCancel(x.config.Ctx)
-
 	var new_ *xinstance
 	{
 		var err error
-		new_, err = x.config.instance()
+		config := x.config
+		config.Ctx, newcancel = context.WithCancel(x.config.Ctx)
+		new_, err = config.instance()
 		if err != nil {
 			if newcancel != nil {
 				newcancel()

diff --git a/tplcontext.go b/tplcontext.go
@@ -388,7 +388,7 @@ func (f flushContext) Repeat(max_ ...int) <-chan int {
 			select {
 			case <-f.requestCtx.Done():
 				break loop
-			case <-f.server.ctx.Done():
+			case <-f.server.Ctx.Done():
 				break loop
 			case c <- i:
 			}
@@ -408,7 +408,7 @@ func (f flushContext) Sleep(ms int) (string, error) {
 	case <-time.After(time.Duration(ms) * time.Millisecond):
 	case <-f.requestCtx.Done():
 		return "", ReturnError{}
-	case <-f.server.ctx.Done():
+	case <-f.server.Ctx.Done():
 		return "", ReturnError{}
 	}
 	return "", nil
@@ -420,7 +420,7 @@ func (f flushContext) Block() (string, error) {
 	select {
 	case <-f.requestCtx.Done():
 		return "", ReturnError{}
-	case <-f.server.ctx.Done():
+	case <-f.server.Ctx.Done():
 		return "", nil
 	}
 }