Improve error handling in API statistics daemon

[chef.git] / cookbooks / web / templates / default / logrotate.web.erb

diff --git a/cookbooks/web/templates/default/logrotate.web.erb b/cookbooks/web/templates/default/logrotate.web.erb
index 8cb1da52641d4877060be5de76ee31e244eeb024..608fd4d38699234f2ac76e06f9cff083612f35f4 100644 (file)
--- a/cookbooks/web/templates/default/logrotate.web.erb
+++ b/cookbooks/web/templates/default/logrotate.web.erb
@@ -3,25 +3,25 @@
 <%= node[:web][:log_directory] %>/*.log {
   daily
   missingok
 <%= node[:web][:log_directory] %>/*.log {
   daily
   missingok

-  rotate 7 
+  rotate 7

   compress
   delaycompress
   notifempty
   create 0660 rails rails
   sharedscripts
   postrotate
   compress
   delaycompress
   notifempty
   create 0660 rails rails
   sharedscripts
   postrotate

-<% if File.directory?("#{node[:web][:base_directory]}/rails") -%>
-    /usr/bin/passenger-config restart-app --ignore-app-not-running <%= node[:web][:base_directory] %>/rails > /dev/null
-<% if node[:recipes].include?("logstash::forwarder") -%>
-    /etc/init.d/logstash-forwarder restart > /dev/null
+<% 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 -%>
 <% end -%>

+<% 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 -%>
 <% end -%>

-<% if File.directory?("#{node[:web][:base_directory]}/gpx-import") -%>
-    /etc/init.d/gpx-import rotated
-<% end -%>
-<% if File.directory?("#{node[:web][:base_directory]}/cgimap") -%>
+<% if node[:recipes].include?("web::cgimap") -%>

     /bin/systemctl reload cgimap
     /bin/systemctl reload cgimap

-    /usr/bin/rsync <%= node[:web][:log_directory] %>/cgimap.log.2.gz ironbelly::logs/www.openstreetmap.org/cgimap-<%= node[:hostname] %>-`date -d "-2 days" +%Y-%m-%d`.gz
+    /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 -%>
   endscript
 }
 <% end -%>
   endscript
 }