From c01bd9ed999777cb669fc2fca8c08d090931c0c0 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sun, 22 Nov 2020 08:19:25 -0500 Subject: [PATCH] better resilience with final supervisor reload --- .../src/main/resources/META-INF/bubble/bubble.properties | 2 +- .../src/main/resources/ansible/roles/finalizer/tasks/main.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties index fe7a4be3..05fbd137 100644 --- a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties +++ b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties @@ -1 +1 @@ -bubble.version=Adventure 1.4.28 +bubble.version=Adventure 1.4.29 diff --git a/bubble-server/src/main/resources/ansible/roles/finalizer/tasks/main.yml b/bubble-server/src/main/resources/ansible/roles/finalizer/tasks/main.yml index 2681d6d8..fd71401d 100644 --- a/bubble-server/src/main/resources/ansible/roles/finalizer/tasks/main.yml +++ b/bubble-server/src/main/resources/ansible/roles/finalizer/tasks/main.yml @@ -66,4 +66,5 @@ # We cannot receive notifications until nginx is running, so start bubble API as the very last step - name: reload supervisord - shell: supervisorctl status > /var/log/bubble/finalizer_supervisor_status_before_reload.log && supervisorctl reload + shell: | + supervisorctl reload || echo "WARNING: supervisorctl reload exited with $?"