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

Minor fixes for Orborus and Worker

Browse Source
This commit is contained in:
Frikky
2025-08-29 14:15:24 +02:00
parent a8dc56daa5
commit 288a9b1d01
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/orborus.go
+2 -2
View File
@@ -4005,7 +4005,7 @@ func sendWorkerRequest(workflowExecution shuffle.ExecutionRequest, image string,
newresp, err := client.Do(req) newresp, err := client.Do(req)
if err != nil { if err != nil {
// Connection refused? // Connection refused?
log.Printf("[ERROR] Error running worker request to %s (1): %s", streamUrl, err) log.Printf("[ERROR][%s] Error running worker request to %s (1): %s", workflowExecution.ExecutionId, streamUrl, err)
if strings.Contains(fmt.Sprintf("%s", err), "connection refused") || strings.Contains(fmt.Sprintf("%s", err), "EOF") { if strings.Contains(fmt.Sprintf("%s", err), "connection refused") || strings.Contains(fmt.Sprintf("%s", err), "EOF") {
workerImage := fmt.Sprintf("ghcr.io/shuffle/shuffle-worker:%s", workerVersion) workerImage := fmt.Sprintf("ghcr.io/shuffle/shuffle-worker:%s", workerVersion)
@@ -4052,7 +4052,7 @@ func sendWorkerRequest(workflowExecution shuffle.ExecutionRequest, image string,
debugCommand = fmt.Sprintf("kubectl logs -n %s deployment/shuffle-workers | grep %s", kubernetesNamespace, workflowExecution.ExecutionId) debugCommand = fmt.Sprintf("kubectl logs -n %s deployment/shuffle-workers | grep %s", kubernetesNamespace, workflowExecution.ExecutionId)
} }
log.Printf("[DEBUG] Ran worker from request with execution ID: %s. Worker URL: %s. DEBUGGING:\n%s", workflowExecution.ExecutionId, streamUrl, debugCommand) log.Printf("[DEBUG][%s] Ran worker from requests. Worker URL: %s. DEBUGGING:\n%s", workflowExecution.ExecutionId, streamUrl, debugCommand)
return nil return nil
} }
functions/onprem/worker/worker.go
+3 -1
View File
@@ -2022,7 +2022,9 @@ func executionInit(workflowExecution shuffle.WorkflowExecution) error {
} }
if len(onpremApps) == 0 { if len(onpremApps) == 0 {
return errors.New(fmt.Sprintf("No apps to handle onprem (%s)", environment)) //return errors.New(fmt.Sprintf("No apps to handle onprem (%s)", environment))
log.Printf("[INFO][%s] No apps to handle onprem (%s). Returning 200 OK anyway", workflowExecution.ExecutionId, environment)
return nil
} }
pullOptions := dockerimage.PullOptions{} pullOptions := dockerimage.PullOptions{}