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

Fixed workflow import issue

Browse Source
This commit is contained in:
frikky
2022-12-06 11:59:30 +00:00
committed by GitHub
parent 7f52e8ed6d
commit 829822fc20
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/go.mod
+1 -1
View File
@@ -19,7 +19,7 @@ require (
github.com/gorilla/mux v1.8.0
github.com/h2non/filetype v1.1.3
github.com/satori/go.uuid v1.2.0
github.com/shuffle/shuffle-shared v0.3.33
github.com/shuffle/shuffle-shared v0.3.34
golang.org/x/crypto v0.3.0
google.golang.org/api v0.103.0
google.golang.org/appengine v1.6.7
backend/go-app/walkoff.go
+5 -17
View File
@@ -780,7 +780,7 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) {
if item.TriggerType == "SCHEDULE" && item.Status != "uninitialized" {
err = deleteSchedule(ctx, item.ID)
if err != nil {
log.Printf("Failed to delete schedule: %s - is it started?", err)
log.Printf("[DEBUG] Failed to delete schedule: %s - is it started?", err)
}
} else if item.TriggerType == "WEBHOOK" {
//err = removeWebhookFunction(ctx, item.ID)
@@ -790,7 +790,7 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) {
} else if item.TriggerType == "EMAIL" {
err = shuffle.HandleOutlookSubRemoval(ctx, user, workflow.ID, item.ID)
if err != nil {
log.Printf("Failed to delete OUTLOOK email sub (checking gmail after): %s", err)
log.Printf("[DEBUG] Failed to delete OUTLOOK email sub (checking gmail after): %s", err)
}
err = shuffle.HandleGmailSubRemoval(ctx, user, workflow.ID, item.ID)
@@ -798,14 +798,8 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) {
log.Printf("Failed to delete gmail email sub: %s", err)
}
}
//err = increaseStatisticsField(ctx, "total_workflow_triggers", workflow.ID, -1, workflow.OrgId)
//if err != nil {
// log.Printf("Failed to increase total workflows: %s", err)
//}
}
// FIXME - maybe delete workflow executions
err = shuffle.DeleteKey(ctx, "workflow", fileId)
if err != nil {
log.Printf("[DEBUG]] Failed deleting key %s", fileId)
@@ -815,11 +809,6 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) {
}
log.Printf("[INFO] Should have deleted workflow %s (%s)", workflow.Name, fileId)
//memcacheName := fmt.Sprintf("%s_%s", user.Username, fileId)
//memcache.Delete(ctx, memcacheName)
//memcacheName = fmt.Sprintf("%s_workflows", user.Username)
//memcache.Delete(ctx, memcacheName)
//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)
@@ -1427,15 +1416,14 @@ func stopScheduleGCP(resp http.ResponseWriter, request *http.Request) {
}
func deleteSchedule(ctx context.Context, id string) error {
log.Printf("Should stop schedule %s!", id)
log.Printf("[DEBUG] Should stop schedule %s!", id)
err := shuffle.DeleteKey(ctx, "schedules", id)
if err != nil {
log.Printf("Failed to delete schedule: %s", err)
log.Printf("[ERROR] Failed to delete schedule: %s", err)
return err
} else {
if value, exists := scheduledJobs[id]; exists {
log.Printf("STOPPING THIS SCHEDULE: %s", id)
// Looks like this does the trick? Hurr
// Stops the schedule properly
value.Lock()
} else {
// FIXME - allow it to kind of stop anyway?