From ef6d38d3aab08e92e7896fa695784f85799e0aa2 Mon Sep 17 00:00:00 2001 From: frikky Date: Fri, 17 Dec 2021 02:08:26 +0100 Subject: [PATCH] Fixed execution cleanup properly, including execution queue and abort issues --- backend/go-app/walkoff.go | 2 +- frontend/src/views/Admin.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index 204e3c90..9d45f0cc 100644 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -208,7 +208,7 @@ func handleGetWorkflowqueueConfirm(resp http.ResponseWriter, request *http.Reque err = shuffle.DeleteKeys(ctx, parsedId, ids) if err != nil { - log.Printf("[ERROR] Failed deleting %d execution keys for org %s", len(ids), id) + log.Printf("[ERROR] Failed deleting %d execution keys for org %s: %s", len(ids), id, err) } else { //log.Printf("[INFO] Deleted %d keys from org %s", len(ids), parsedId) } diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx index 13ee69df..098fd3d5 100644 --- a/frontend/src/views/Admin.jsx +++ b/frontend/src/views/Admin.jsx @@ -864,7 +864,7 @@ const Admin = (props) => { const abortEnvironmentWorkflows = (environment) => { //console.log("Aborting all workflows started >10 minutes ago, not finished"); - fetch(`${globalUrl}/api/v1/environments/${environment}/stop`, { + fetch(`${globalUrl}/api/v1/environments/${environment.id}/stop?deleteall=true`, { method: "GET", credentials: "include", }) @@ -3809,7 +3809,7 @@ const Admin = (props) => { ? environment.running_ip === undefined || environment.running_ip === null || environment.running_ip.length === 0 - ? "Not started" + ? "Not running" : environment.running_ip : "N/A" }