From e31656058c17ff51a5ee0cddcfaf3d601e5cbe31 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 3 Jan 2020 13:30:49 -0700
Subject: [PATCH] Fix contexts in the import controller as well
See d0c83eb48dd0236f13a9680319fca3eb651b5a1f
---
controllers/data_controller/import_controller.go | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/controllers/data_controller/import_controller.go b/controllers/data_controller/import_controller.go
index 8fb6a76f..dd7d302d 100644
--- a/controllers/data_controller/import_controller.go
+++ b/controllers/data_controller/import_controller.go
@@ -4,6 +4,7 @@ import (
"archive/tar"
"bytes"
"compress/gzip"
+ "context"
"database/sql"
"encoding/json"
"errors"
@@ -130,6 +131,9 @@ func processArchive(data io.Reader) (map[string]*bytes.Buffer, error) {
}
func doImport(updateChannel chan *importUpdate, taskId int, importId string, ctx rcontext.RequestContext) {
+ // Use a new context in the goroutine
+ ctx.Context = context.Background()
+
ctx.Log.Info("Preparing for import...")
fileMap := make(map[string]*bytes.Buffer)
stopImport := false
--
GitLab