capistrano-unicorn-nginx 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8ddad3cf564b9cfbcff371c0e13737733c5965c
-  data.tar.gz: 79441091d32be807205469f230f08bc98f9cd27b
+  metadata.gz: 98fa7684b9edfa61257f2b2bb53b1459efe853b8
+  data.tar.gz: 28a21acc6aa76bb167246ddef2e7dbecc11bb38d
 SHA512:
-  metadata.gz: f63dc9207ae9e2fade717e5105354d718cc88added1954ea7015e73ff529aaa511d92634c4a6db2ab526e4e47301aca9bbd885a8f61e4c52962520bb803c9274
-  data.tar.gz: 50e42a13d0fdeed608e30d4d03eea961344ad05d1ec51522cbbf07352663902c57634541d6f53a91b89eff988d5e91efa4279279a31ae652fb11de038e110149
+  metadata.gz: e1ec2f6f9fd7cae579ebe7c87f078842f56d380ef3f899f336fe789b432a411eaeec2520f0ff41ba000115c624df3c9c092bd6c74af62d7dfca981f2285eff3b
+  data.tar.gz: a9e7f049219a0c771ddf04639841317f3ed188f38f9243302a9134d2b58e23f54df26ebfa4c4d6b59918a313e84c51ff70bd7ac24dff5060a8ef53884de99b30

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### master
 
+### v3.3.1, 2015-02-16
+- made nginx fail_timeout configurable (@rhomeister)
+- added logrotate configuration for nginx logs (@rhomeister)
+
 ### v3.3.0, 2015-02-09
 - added client SSL authentication (@rhomeister)
 - make unicorn timeout configurable (@vicentllongo)

data/lib/capistrano/dsl/unicorn_paths.rb

@@ -14,14 +14,21 @@ module Capistrano
         shared_path.join('tmp/pids/unicorn.pid')
       end
 
+      def unicorn_log_dir
+        shared_path.join('log')
+      end
+
       def unicorn_log_file
-        shared_path.join('log/unicorn.stdout.log')
+        log_dir.join('unicorn.stdout.log')
       end
 
       def unicorn_error_log_file
-        shared_path.join('log/unicorn.stderr.log')
+        log_dir.join('unicorn.stderr.log')
       end
 
+      def unicorn_default_logrotate_config_file
+        "/etc/logrotate.d/#{fetch(:unicorn_service)}"
+      end
     end
   end
 end

data/lib/capistrano/tasks/nginx.rake

@@ -21,6 +21,7 @@ namespace :load do
     set :nginx_upload_local_cert, true
     set :nginx_ssl_cert_local_path, -> { ask(:nginx_ssl_cert_local_path, 'Local path to ssl certificate: ') }
     set :nginx_ssl_cert_key_local_path, -> { ask(:nginx_ssl_cert_key_local_path, 'Local path to ssl certificate key: ') }
+    set :nginx_fail_timeout, 0 # see http://nginx.org/en/docs/http/ngx_http_upstream_module.html#fail_timeout
 
     set :linked_dirs, fetch(:linked_dirs, []).push('log')
   end

data/lib/capistrano/tasks/unicorn.rake

@@ -10,6 +10,7 @@ namespace :load do
     set :templates_path, 'config/deploy/templates'
     set :unicorn_pid, -> { unicorn_default_pid_file }
     set :unicorn_config, -> { unicorn_default_config_file }
+    set :unicorn_logrotate_config, -> { unicorn_default_logrotate_config_file }
     set :unicorn_workers, 2
     set :unicorn_worker_timeout, 30
     set :unicorn_tcp_listen_port, 8080
@@ -17,6 +18,8 @@ namespace :load do
     set :unicorn_app_env, -> { fetch(:rails_env) || fetch(:stage) }
     # set :unicorn_user # default set in `unicorn:defaults` task
 
+    set :unicorn_logrotate_enabled, false # by default, don't use logrotate to rotate unicorn logs
+
     set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids')
   end
 end
@@ -46,6 +49,15 @@ namespace :unicorn do
     end
   end
 
+  desc 'Setup logrotate configuration'
+  task :setup_logrotate do
+    on roles :app do
+      sudo :mkdir, '-pv', File.dirname(fetch(:unicorn_logrotate_config))
+      sudo_upload! template('unicorn-logrotate.rb.erb'), fetch(:unicorn_logrotate_config)
+      sudo 'chown', 'root:root', fetch(:unicorn_logrotate_config)
+    end
+  end
+
   %w[start stop restart].each do |command|
     desc "#{command} unicorn"
     task command do
@@ -56,6 +68,7 @@ namespace :unicorn do
   end
 
   before :setup_initializer, :defaults
+  before :setup_logrotate, :defaults
 
 end
 
@@ -67,4 +80,7 @@ desc 'Server setup tasks'
 task :setup do
   invoke 'unicorn:setup_initializer'
   invoke 'unicorn:setup_app_config'
+  if fetch(:unicorn_logrotate_enabled)
+    invoke 'unicorn:setup_logrotate'
+  end
 end

data/lib/capistrano/unicorn_nginx/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module UnicornNginx
-    VERSION = "3.3.0"
+    VERSION = "3.3.1"
   end
 end

data/lib/generators/capistrano/unicorn_nginx/templates/nginx_conf.erb

@@ -1,10 +1,10 @@
 upstream unicorn_<%= fetch(:nginx_config_name) %> {
 <% if fetch(:unicorn_use_tcp) %>
   <% roles(:app).each do |role| %>
-    server <%= role.hostname %>:<%= fetch(:unicorn_tcp_listen_port)%> fail_timeout=0;
+    server <%= role.hostname %>:<%= fetch(:unicorn_tcp_listen_port)%> fail_timeout=<%= fetch(:nginx_fail_timeout) %>;
   <% end %>
 <% else %>
-  server unix:/tmp/unicorn.<%= fetch(:nginx_config_name) %>.sock fail_timeout=0;
+  server unix:/tmp/unicorn.<%= fetch(:nginx_config_name) %>.sock fail_timeout=<%= fetch(:nginx_fail_timeout) %>;
 <% end %>
 }
 

data/lib/generators/capistrano/unicorn_nginx/templates/unicorn-logrotate.rb.erb

@@ -0,0 +1,25 @@
+# logrotate.erb.conf
+# Logrotate config for <%= fetch(:application) %> <%= fetch(:stage) %>
+# Generated at <%= Time.now.strftime("%d.%m.%Y, %H:%M") %>
+
+<%= unicorn_log_dir %>/*.log {
+    daily
+    missingok
+    rotate 180
+    compress
+    dateext
+    su <%= fetch(:unicorn_user) %> <%= fetch(:unicorn_user) %>
+
+    # this is important if using "compress" since we need to call
+    # the "lastaction" script below before compressing:
+    delaycompress
+
+    # note the lack of the evil "copytruncate" option in this
+    # config.  Unicorn supports the USR1 signal and we send it
+    # as our "lastaction" action:
+    # USR1 - reopen all logs owned by the master and all workers
+    lastaction
+      pid=<%= fetch(:unicorn_pid) %>
+      test -s $pid && kill -USR1 "$(cat $pid)"
+    endscript
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-nginx
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Ruben Stranders
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -85,6 +85,7 @@ files:
 - lib/generators/capistrano/unicorn_nginx/config_generator.rb
 - lib/generators/capistrano/unicorn_nginx/templates/_default_server_directive.erb
 - lib/generators/capistrano/unicorn_nginx/templates/nginx_conf.erb
+- lib/generators/capistrano/unicorn_nginx/templates/unicorn-logrotate.rb.erb
 - lib/generators/capistrano/unicorn_nginx/templates/unicorn.rb.erb
 - lib/generators/capistrano/unicorn_nginx/templates/unicorn_init.erb
 homepage: https://github.com/bruno-/capistrano-unicorn-nginx