From 77487a96cb7b705cc55d8b39605bb86332367c51 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 16 Jul 2022 12:04:47 +0100 Subject: [PATCH 1/1] Fix log rollover for frontends --- cookbooks/web/templates/default/logrotate.web.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cookbooks/web/templates/default/logrotate.web.erb b/cookbooks/web/templates/default/logrotate.web.erb index 21a37a40a..608fd4d38 100644 --- a/cookbooks/web/templates/default/logrotate.web.erb +++ b/cookbooks/web/templates/default/logrotate.web.erb @@ -10,14 +10,16 @@ create 0660 rails rails sharedscripts postrotate -<% if File.directory?("#{node[:web][:base_directory]}/rails") -%> +<% if node[:recipes].include?("web::rails") -%> /bin/sleep 30 PASSENGER_INSTANCE_REGISTRY_DIR=<%= node[:passenger][:instance_registry_dir] %> /usr/bin/passenger-config restart-app --ignore-app-not-running --name rails > /dev/null <% end -%> -<% if File.directory?("#{node[:web][:base_directory]}/gpx-import") -%> - /bin/systemctl try-reload-or-restart gpx-import +<% if node[:recipes].include?("web::frontend") -%> + /bin/systemctl try-reload-or-restart rails-jobs@mailers + /bin/systemctl try-reload-or-restart rails-jobs@storage + /bin/systemctl try-reload-or-restart rails-jobs@traces <% end -%> -<% if File.directory?("#{node[:web][:base_directory]}/cgimap") -%> +<% if node[:recipes].include?("web::cgimap") -%> /bin/systemctl reload cgimap /usr/bin/rsync --preallocate <%= node[:web][:log_directory] %>/cgimap.log.2.gz ironbelly::logs/www.openstreetmap.org/cgimap-<%= node[:hostname] %>-`date -d "-2 days" +%Y-%m-%d`.gz <% end -%> -- 2.39.5