diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index cdf0240d..8560f1ce 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -38,8 +38,10 @@ class AppBase:
# I wonder if this actually works
self.logger.info("Before last stream result")
+ url = "%s%s" % (self.url, stream_path)
+ print("URL: %s" % url)
try:
- ret = requests.post("%s%s" % (self.url, stream_path), headers=headers, json=action_result)
+ ret = requests.post(url, headers=headers, json=action_result)
self.logger.info("Result: %d" % ret.status_code)
if ret.status_code != 200:
self.logger.info(ret.text)
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index a47a6506..c42baf98 100644
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -1307,10 +1307,10 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
workflowExecution.LastNode = actionResult.Action.ID
}
- err = increaseStatisticsField(ctx, "workflow_executions_success", workflowExecution.Workflow.ID, 1, workflowExecution.ExecutionOrg)
- if err != nil {
- log.Printf("Failed to increase success execution stats: %s", err)
- }
+ //err = increaseStatisticsField(ctx, "workflow_executions_success", workflowExecution.Workflow.ID, 1, workflowExecution.ExecutionOrg)
+ //if err != nil {
+ // log.Printf("Failed to increase success execution stats: %s", err)
+ //}
// Handles extra statistics stuff when it's done
// Does autocomplete magic with JSON
@@ -2776,6 +2776,9 @@ func handleExecution(id string, workflow Workflow, request *http.Request) (Workf
// This one doesn't really matter.
log.Printf("[INFO] Running POST execution with body of length %d", len(string(body)))
+ if len(string(body)) < 50 {
+ log.Printf("Body: %s", string(body))
+ }
var execution ExecutionRequest
err = json.Unmarshal(body, &execution)
if err != nil {
diff --git a/docker-compose.yml b/docker-compose.yml
index 3f78346f..8c3b5ba7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,7 +54,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock
environment:
- SHUFFLE_APP_SDK_VERSION=0.8.51
- - SHUFFLE_WORKER_VERSION=0.8.51
+ - SHUFFLE_WORKER_VERSION=0.8.5
- ORG_ID=${ORG_ID}
- ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
- BASE_URL=http://${OUTER_HOSTNAME}:${BACKEND_PORT}
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index d5480ac3..80228f8c 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -573,7 +573,9 @@ const AngularWorkflow = (props) => {
currentnode.addClass('failure-highlight')
if (!visited.includes(item.action.label)) {
- alert.error("Error for "+item.action.label+" with result "+item.result)
+ if (!item.action.result.includes("failed condition")) {
+ alert.error("Error for "+item.action.label+" with result "+item.result)
+ }
visited.push(item.action.label)
setVisited(visited)
}
@@ -6223,38 +6225,26 @@ const AngularWorkflow = (props) => {
const parsedExecutionArgument = () => {
var showResult = executionData.execution_argument.trim()
- showResult = showResult.split(" None").join(" \"None\"")
- showResult = showResult.split(" False").join(" false")
- showResult = showResult.split(" True").join(" true")
+ const validate = validateJson(showResult)
- var jsonvalid = true
- try {
- const tmp = String(JSON.parse(showResult))
- if (!showResult.includes("{") && !showResult.includes("[")) {
- jsonvalid = false
+
+ if (validate.valid) {
+ if (typeof(validate.result) === "string") {
+ validate.result = JSON.parse(validate.result)
}
- } catch (e) {
- showResult = showResult.split("\'").join("\"")
- try {
- const tmp = String(JSON.parse(showResult))
- if (!showResult.includes("{") && !showResult.includes("[")) {
- jsonvalid = false
- }
- } catch (e) {
- jsonvalid = false
- }
- }
-
- if (jsonvalid) {
return (