Mercurial > gemma
diff pkg/controllers/importqueue.go @ 4242:1458c9b0fdaa json-handler-middleware
Made the sql.Conn in function accessible via the context of the request.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 22 Aug 2019 10:18:13 +0200 |
| parents | 948e312e87bc |
| children | d776110b4db0 |
line wrap: on
line diff
--- a/pkg/controllers/importqueue.go Thu Aug 22 09:20:38 2019 +0200 +++ b/pkg/controllers/importqueue.go Thu Aug 22 10:18:13 2019 +0200 @@ -231,7 +231,6 @@ func listImports( _ interface{}, req *http.Request, - conn *sql.Conn, ) (jr JSONResult, err error) { var list, before, after *filledStmt @@ -242,6 +241,8 @@ ctx := req.Context() + conn := JSONConn(req) + // Fast path for counting switch count := strings.ToLower(req.FormValue("count")); count { @@ -324,13 +325,14 @@ func importLogs( _ interface{}, req *http.Request, - conn *sql.Conn, ) (jr JSONResult, err error) { ctx := req.Context() id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64) + conn := JSONConn(req) + // Check if he have such a import job first. var summary sql.NullString var enqueued time.Time @@ -399,14 +401,13 @@ func deleteImport( _ interface{}, req *http.Request, - conn *sql.Conn, ) (jr JSONResult, err error) { ctx := req.Context() id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64) var tx *sql.Tx - tx, err = conn.BeginTx(ctx, nil) + tx, err = JSONConn(req).BeginTx(ctx, nil) if err != nil { return } @@ -467,7 +468,6 @@ func reviewImports( reviews interface{}, req *http.Request, - conn *sql.Conn, ) (JSONResult, error) { rs := *reviews.(*[]models.Review) @@ -480,6 +480,8 @@ results := make([]reviewResult, len(rs)) + conn := JSONConn(req) + for i := range rs { rev := &rs[i] msg, err := decideImport(req, conn, rev.ID, string(rev.State)) @@ -500,7 +502,6 @@ func reviewImport( _ interface{}, req *http.Request, - conn *sql.Conn, ) (jr JSONResult, err error) { vars := mux.Vars(req) @@ -508,7 +509,7 @@ state := vars["state"] var msg string - if msg, err = decideImport(req, conn, id, state); err != nil { + if msg, err = decideImport(req, JSONConn(req), id, state); err != nil { return }