marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed execution cleanup properly, including execution queue and abort issues

Browse Source
This commit is contained in:
frikky
2021-12-17 02:08:26 +01:00
parent 8dc950bbe0
commit ef6d38d3aa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/walkoff.go
+1 -1
View File
@@ -208,7 +208,7 @@ func handleGetWorkflowqueueConfirm(resp http.ResponseWriter, request *http.Reque
err = shuffle.DeleteKeys(ctx, parsedId, ids) err = shuffle.DeleteKeys(ctx, parsedId, ids)
if err != nil { 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 { } else {
//log.Printf("[INFO] Deleted %d keys from org %s", len(ids), parsedId) //log.Printf("[INFO] Deleted %d keys from org %s", len(ids), parsedId)
} }
frontend/src/views/Admin.jsx
+2 -2
View File
@@ -864,7 +864,7 @@ const Admin = (props) => {
const abortEnvironmentWorkflows = (environment) => { const abortEnvironmentWorkflows = (environment) => {
//console.log("Aborting all workflows started >10 minutes ago, not finished"); //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", method: "GET",
credentials: "include", credentials: "include",
}) })
@@ -3809,7 +3809,7 @@ const Admin = (props) => {
? environment.running_ip === undefined || ? environment.running_ip === undefined ||
environment.running_ip === null || environment.running_ip === null ||
environment.running_ip.length === 0 environment.running_ip.length === 0
? "Not started" ? "Not running"
: environment.running_ip : environment.running_ip
: "N/A" : "N/A"
} }