From 575b0bb297a21360695ba88fc83be69ecd2eee5b Mon Sep 17 00:00:00 2001 From: frikky Date: Fri, 30 Jul 2021 19:53:13 +0200 Subject: [PATCH] Added debug info for bug with workflow deletions --- backend/app_sdk/build.sh | 2 +- backend/go-app/go.mod | 4 ++-- backend/go-app/walkoff.go | 5 +++-- docker-compose.yml | 2 +- frontend/src/views/Workflows.jsx | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/backend/app_sdk/build.sh b/backend/app_sdk/build.sh index 1e52f74d..028328e1 100644 --- a/backend/app_sdk/build.sh +++ b/backend/app_sdk/build.sh @@ -3,7 +3,7 @@ ### DEFAULT NAME=shuffle-app_sdk -VERSION=0.8.104 +VERSION=0.9.02 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 9841d41a..8fd1bd75 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -2,7 +2,7 @@ module shuffle go 1.13 -replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared +//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi @@ -22,7 +22,7 @@ require ( github.com/docker/go-units v0.4.0 // indirect github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect github.com/frikky/kin-openapi v0.39.0 - github.com/frikky/shuffle-shared v0.0.74 + github.com/frikky/shuffle-shared v0.0.76 github.com/fsouza/go-dockerclient v1.7.2 github.com/ghodss/yaml v1.0.0 github.com/go-git/go-billy/v5 v5.0.0 diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index 04827474..34f6d5bb 100644 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -1190,12 +1190,12 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) { // FIXME - maybe delete workflow executions err = shuffle.DeleteKey(ctx, "workflow", fileId) if err != nil { - log.Printf("Failed deleting key %s", fileId) + log.Printf("[DEBUG]] Failed deleting key %s", fileId) resp.WriteHeader(401) resp.Write([]byte(`{"success": false, "reason": "Failed deleting key"}`)) return } - log.Printf("[INFO] Should have deleted workflow %s", fileId) + log.Printf("[INFO] Should have deleted workflow %s (%s)", workflow.Name, fileId) //memcacheName := fmt.Sprintf("%s_%s", user.Username, fileId) //memcache.Delete(ctx, memcacheName) @@ -1204,6 +1204,7 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) { //cacheKey := fmt.Sprintf("%s_workflows", user.Id) cacheKey := fmt.Sprintf("%s_workflows", user.Id) shuffle.DeleteCache(ctx, cacheKey) + log.Printf("[DEBUG] Cleared workflow cache for %s (%s)", user.Username, user.Id) resp.WriteHeader(200) resp.Write([]byte(`{"success": true}`)) diff --git a/docker-compose.yml b/docker-compose.yml index 3bba8d9c..471d1e38 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: frontend: - build: ./frontend + #build: ./frontend image: ghcr.io/frikky/shuffle-frontend:nightly container_name: shuffle-frontend hostname: shuffle-frontend diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx index ac279bd7..c8898acf 100644 --- a/frontend/src/views/Workflows.jsx +++ b/frontend/src/views/Workflows.jsx @@ -1979,7 +1979,7 @@ const Workflows = (props) => { //backgroundColor: inputColor, }, }} - placeholder="Filter Your Workflows" + placeholder="Add Filter" color="primary" fullWidth value={filters}