From a522ad1d9ad4c13690913f311dca4afb8aaa8b43 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Thu, 20 Jan 2022 21:13:51 -0800 Subject: [PATCH] puppet: Always create a uwsgi master control socket. This is potentially useful even with rolling restarts disabled. --- puppet/zulip/manifests/app_frontend_base.pp | 6 ------ puppet/zulip/templates/uwsgi.ini.template.erb | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/puppet/zulip/manifests/app_frontend_base.pp b/puppet/zulip/manifests/app_frontend_base.pp index 2e71a2f7eb..88afea7f74 100644 --- a/puppet/zulip/manifests/app_frontend_base.pp +++ b/puppet/zulip/manifests/app_frontend_base.pp @@ -119,12 +119,6 @@ class zulip::app_frontend_base { notify => Service[$zulip::common::supervisor_service], } - $uwsgi_rolling_restart = zulipconf('application_server', 'rolling_restart', '') - if $uwsgi_rolling_restart == '' { - file { '/home/zulip/deployments/uwsgi-control': - ensure => absent, - } - } $uwsgi_listen_backlog_limit = zulipconf('application_server', 'uwsgi_listen_backlog_limit', 128) $uwsgi_buffer_size = zulipconf('application_server', 'uwsgi_buffer_size', 8192) $uwsgi_processes = zulipconf('application_server', 'uwsgi_processes', $uwsgi_default_processes) diff --git a/puppet/zulip/templates/uwsgi.ini.template.erb b/puppet/zulip/templates/uwsgi.ini.template.erb index 1578c47abb..1dbbb8caa3 100644 --- a/puppet/zulip/templates/uwsgi.ini.template.erb +++ b/puppet/zulip/templates/uwsgi.ini.template.erb @@ -15,6 +15,9 @@ chown-socket=zulip:zulip socket=/home/zulip/deployments/uwsgi-socket listen=<%= @uwsgi_listen_backlog_limit %> +# Create a control socket, allowing fancier runtime control +master-fifo=/home/zulip/deployments/uwsgi-control + # How many serving processes to fork @@ -47,9 +50,6 @@ hook-post-fork=chdir:/home/zulip/deployments/current # https://uwsgi-docs.readthedocs.io/en/latest/articles/TheArtOfGracefulReloading.html#preforking-vs-lazy-apps-vs-lazy lazy-apps=true -# Create a control socket, allowing fancier runtime control -master-fifo=/home/zulip/deployments/uwsgi-control - <% end -%>