From 7d1c4ea7225c5a02ea9f70f94c3634d0e3e99b4a Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 14 Dec 2017 14:23:32 +0000 Subject: [PATCH 1/2] fix makefile syntax --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d9fe648df..ea6bb8c41 100644 --- a/Makefile +++ b/Makefile @@ -283,7 +283,7 @@ cf-deploy: ## Deploys the app to Cloud Foundry sleep 10 # get the new GUID, and find all crash events for that. If there were any crashes we will abort the deploy. - [ $(cf curl "/v2/events?q=type:app.crash&q=actee:$$(cf app --guid notify-delivery-worker-receipts)" | jq ".total_results") -eq 0 ] + [ $$(cf curl "/v2/events?q=type:app.crash&q=actee:$$(cf app --guid ${CF_APP})" | jq ".total_results") -eq 0 ] cf delete -f ${CF_APP}-rollback .PHONY: cf-deploy-api-db-migration From 0ad43f0c5b1601e8ab3d36e6e16f340585688b58 Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Thu, 14 Dec 2017 16:00:51 +0000 Subject: [PATCH 2/2] Create letters pdf queue was renamed with tasks, but was lost in another merge - needs to be correct name otherwise the delivery worker will not pick up the queue --- app/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config.py b/app/config.py index f2d37a769..0205262a0 100644 --- a/app/config.py +++ b/app/config.py @@ -30,7 +30,7 @@ class QueueNames(object): RETRY = 'retry-tasks' NOTIFY = 'notify-internal-tasks' PROCESS_FTP = 'process-ftp-tasks' - CREATE_LETTERS_PDF = 'create-letters-pdf' + CREATE_LETTERS_PDF = 'create-letters-pdf-tasks' CALLBACKS = 'service-callbacks' @staticmethod