Rework tile cache logging to avoid duplication

Closes #94

diff --git a/cookbooks/nginx/attributes/default.rb b/cookbooks/nginx/attributes/default.rb
index fc2573314efca3721091c0897fbc67b7ad8f19e4..44fb5bc10339d71a7f3a8a57a1c3b5dd69426ef1 100644 (file)
--- a/cookbooks/nginx/attributes/default.rb
+++ b/cookbooks/nginx/attributes/default.rb
@@ -1,3 +1,6 @@
+# Tuning for access logging
+default[:nginx][:access_log] = "/var/log/nginx/access.log"
+

 # Tuning for nginx fastcgi cache zone
 default[:nginx][:cache][:fastcgi][:enable] = false
 default[:nginx][:cache][:fastcgi][:keys_zone] = "fastcgi_cache_zone:32M"
 # Tuning for nginx fastcgi cache zone
 default[:nginx][:cache][:fastcgi][:enable] = false
 default[:nginx][:cache][:fastcgi][:keys_zone] = "fastcgi_cache_zone:32M"

diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index a895af303c46e8b930625ada40ddee164e267b4b..67b080bf16d443a613b0faaf6076d730e915a07a 100644 (file)
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -19,11 +19,13 @@ http {
 
     server_names_hash_bucket_size 128;
 
 
     server_names_hash_bucket_size 128;
 

+<% if node[:nginx][:access_log] -%>

     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 

-    access_log  /var/log/nginx/access.log  main  buffer=32k flush=1m;
+    access_log  <%= node[:nginx][:access_log] %>  main  buffer=32k flush=1m;
+<% end -%>

 
     keepalive_timeout  65;
 
 
     keepalive_timeout  65;
 

diff --git a/cookbooks/squid/attributes/default.rb b/cookbooks/squid/attributes/default.rb
index 990b0dc170f9f6bc5159199e814088a5839e6895..f26853fa82ae39309e7c4ae40344c0dbe16c9aa9 100644 (file)
--- a/cookbooks/squid/attributes/default.rb
+++ b/cookbooks/squid/attributes/default.rb
@@ -1,4 +1,4 @@
 
 default[:squid][:cache_mem] = "256 MB"
 default[:squid][:cache_dir] = "ufs /var/spool/squid 256 16 256"
 
 default[:squid][:cache_mem] = "256 MB"
 default[:squid][:cache_dir] = "ufs /var/spool/squid 256 16 256"

-default[:squid][:access_log] = "/var/log/squid/access.log squid"
+default[:squid][:access_log] = "/var/log/squid/access.log openstreetmap"

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 54e6e4af4848d5a3056cf05c1d8dc7d397e7d3aa..f024adcc6dfba19f1d0c5be94d083a4349092768 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -85,3 +85,7 @@ munin_plugin "squid_icp"
 munin_plugin "squid_objectsize"
 munin_plugin "squid_requests"
 munin_plugin "squid_traffic"
 munin_plugin "squid_objectsize"
 munin_plugin "squid_requests"
 munin_plugin "squid_traffic"

+
+Dir.glob("/var/log/squid/zere.log*") do |log|
+  File.unlink(log)
+end

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index 35b336cada2eed2794e54f9eeaf2ebe05f4d1802..f290f730d22b16f7f1174f435a03dc0e3552d064 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -84,10 +84,7 @@ http_access deny purge
 forwarded_for on
 follow_x_forwarded_for allow localhost
 
 forwarded_for on
 follow_x_forwarded_for allow localhost
 

-#Loggin used for analysis
-logformat zerelog %ts.%03tu %rp "%{Etag}<h" %>a "%{User-Agent}>h" %<st
-access_log /var/log/squid/zere.log zerelog
-
+logformat openstreetmap %ts.%03tu %tr %>a %Ss/%03Hs %<st %rm %rp %Sh/%<A %mt "%{Referer}>h" "%{User-Agent}>h"

 access_log <%= node[:squid][:access_log] %>
 cache_log /var/log/squid/cache.log
 cache_store_log none
 access_log <%= node[:squid][:access_log] %>
 cache_log /var/log/squid/cache.log
 cache_store_log none

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 41a4e7f71935e018806e296b53ef4ac4b659ce57..0a02e1567edfac8c19ce52df47e44b55b724685d 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -138,3 +138,7 @@ tilerenders.each do |render|
     conf_variables :host => render[:fqdn]
   end
 end
     conf_variables :host => render[:fqdn]
   end
 end

+
+Dir.glob("/var/log/nginx/access.log*") do |log|
+  File.unlink(log)
+end

diff --git a/cookbooks/tilecache/templates/default/logrotate.squid.erb b/cookbooks/tilecache/templates/default/logrotate.squid.erb
index 2112b85cde2f631e38679ad42cd1eba2c7852b53..0c45dcab0b13a5a8c2763ad1b0c0705c52b5ba3a 100644 (file)
--- a/cookbooks/tilecache/templates/default/logrotate.squid.erb
+++ b/cookbooks/tilecache/templates/default/logrotate.squid.erb
@@ -14,6 +14,6 @@
     test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate
   endscript
   lastaction
     test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate
   endscript
   lastaction

-    /usr/bin/rsync --preallocate /var/log/squid/zere.log.1.xz ironbelly::logs/tile.openstreetmap.org/<%= node[:hostname] %>-`date -d "-1 days" +%Y-%m-%d`.xz || true
+    /usr/bin/rsync --preallocate /var/log/squid/access.log.1.xz ironbelly::logs/tile.openstreetmap.org/<%= node[:hostname] %>-`date -d "-1 days" +%Y-%m-%d`.xz || true

   endscript
 }
   endscript
 }

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 313c262f49e148cea605e46881f1b750d84a13e8..a579079ff15e2a176a351890cb7c789a90e8066e 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -12,6 +12,9 @@ default_attributes(
   :apt => {
     :sources => ["nginx"]
   },
   :apt => {
     :sources => ["nginx"]
   },

+  :nginx => {
+    :access_log => nil
+  },

   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",