orats 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbccb8c00361dea723d301183745797447eeeb4f
-  data.tar.gz: dbad0eeb8335a5757768e2caa618c58bbcd3a6a4
+  metadata.gz: 83d8c43283eef490327ff90675b0e529a7357bab
+  data.tar.gz: 9a1776f981cc18005e89c35e44aa83801038e777
 SHA512:
-  metadata.gz: 65e9bbdc2b9213da36d70496563f408862a6e9f5e6c70298df9a143d80c59d9b1db1cb5f1adac574838551a74513e01b4f79e33fe7eabfbbb2ce577b64769da9
-  data.tar.gz: 3921fb46ed73e72dadbbd4a49c647165141671de60b866f1c159fc0a44b1a4c667b2a19c5eae473ac7a977b5566d43c42a650a3c3f224211d9aae5cf7d976a65
+  metadata.gz: a2682482822e5a30a57568a0696a44b00afc750d2bc2907e01e2399d29208b8525fe287db1ef59b3dc307f422a6be2daee586ba65c6cf2f2c8cbd0da8ba27bad
+  data.tar.gz: 355f88e955b843ab9d1f7bcb4b890e42c93551d3587dc00474101045dc1b546b131f4efa5d5c6843d42ddfcba43c319164a98fcb5fc99dd79c5d974c452bd6d3

data/README.md

@@ -145,6 +145,7 @@ All of the changes have git commits to go with them. After generating a project
         - Add disqus
 - **Public**:
     - Add 404, 422, 500 and 502 pages so they can be served directly from your reverse proxy
+    - Add a deploy page that could be swapped in/out during server deploys
     - Add all of the favicons output by the favicon generator
 
 #### Try the base template

data/lib/orats/templates/base.rb

@@ -358,15 +358,16 @@ def add_layout_partials
   commit 'Add layout partials'
 end
 
-def add_http_error_pages
+def add_public_html_pages
   task __method__
 
   orats_to_local 'public/404.html'
   orats_to_local 'public/422.html'
   orats_to_local 'public/500.html'
   orats_to_local 'public/502.html'
+  orats_to_local 'public/deploy.html'
 
-  commit 'Add http status code pages'
+  commit 'Add public html pages'
 end
 
 def update_sass
@@ -517,7 +518,7 @@ add_favicon_task
 add_helpers
 add_layout
 add_layout_partials
-add_http_error_pages
+add_public_html_pages
 update_sass
 update_coffeescript
 remove_unused_files_from_git

data/lib/orats/templates/includes/new/rails/.env

@@ -29,6 +29,9 @@ ACTION_MAILER_DEFAULT_TO: 'me@app_name.com'
 DATABASE_URL: 'postgresql://db_user@db_location:db_port/app_name?encoding=utf8&pool=5&timeout=5000'
 CACHE_URL: 'redis://cache_location:cache_port/0'
 
+# listen on a tcp port or unix socket
+LISTEN_ON: '0.0.0.0:3000'
+
 # try setting these to 0/16 in production and tweak from there
 # in development mode you should use 0/1 ( multi-threaded + debugging = :< )
 # these only apply if you're using puma

data/lib/orats/templates/includes/new/rails/config/puma.rb

@@ -1,26 +1,37 @@
-environment ENV['RAILS_ENV']
-
+# Feel free to experiment with this, 0/16 is a good starting point.
 threads ENV['THREADS_MIN'].to_i, ENV['THREADS_MAX'].to_i
+
+# Go with at least 1 per CPU core, a higher amount will usually help for fast
+# responses such as reading from a cache.
 workers ENV['WORKERS'].to_i
 
-if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test'
-  bind 'tcp://0.0.0.0:3000'
+# Listen on a tcp port or unix socket.
+if ENV['LISTEN_ON'].include?(':')
+  bind "tcp://#{ENV['LISTEN_ON']}"
 else
-  bind "unix:#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}"
+  bind "unix:#{ENV['LISTEN_ON']}"
 end
 
+# The path where the pid file will be written to.
 pidfile "#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}.pid"
 
+# Use a shorter timeout instead of the 60s default. If you are handling large
+# uploads you may want to increase this.
 worker_timeout 30
 
+# The paths to where logs will be written to.
 stdout_redirect "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}.access.log",
                 "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}.error.log"
 
+# Preload the application before starting the workers.
 preload_app!
 
-restart_command 'bundle exec puma'
+# The path to the puma binary without any arguments, it will inherit everything
+# from the original process.
+restart_command 'bin/puma'
 
 on_worker_boot do
+  # Don't bother having the master process hang onto older connections.
   defined?(ActiveRecord::Base) and
     ActiveRecord::Base.connection.disconnect!
 

data/lib/orats/templates/includes/new/rails/config/unicorn.rb

@@ -1,30 +1,45 @@
-# heavily inspired by gitlab:
+# Heavily inspired by gitlab:
 # https://github.com/gitlabhq/gitlabhq/blob/master/config/unicorn.rb.example
 
+# Go with at least 1 per CPU core, a higher amount will usually help for fast
+# responses such as reading from a cache.
 worker_processes ENV['WORKERS'].to_i
 
-if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test'
-  listen '0.0.0.0:3000'
+# Listen on a tcp port or unix socket.
+if ENV['LISTEN_ON'].include?(':')
+  listen ENV['LISTEN_ON']
 else
-  listen "unix:#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}",
-         backlog: 64
+  # Use a shorter socket backlog for quicker failover when busy.
+  listen ENV['LISTEN_ON'], backlog: 64
 end
 
+# The path where the pid file will be written to.
 pid "#{ENV['RUN_STATE_PATH']}/#{ENV['SERVICE']}.pid"
 
+# Use a shorter timeout instead of the 60s default. If you are handling large
+# uploads you may want to increase this.
 timeout 30
 
+# The paths to where logs will be written to.
 stdout_path "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}.access.log"
 stderr_path "#{ENV['LOG_PATH']}/#{ENV['SERVICE']}.error.log"
 
+# Combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings:
+# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
 preload_app true
-
 GC.respond_to?(:copy_on_write_friendly=) and
   GC.copy_on_write_friendly = true
 
+# Enable this flag to have unicorn test client connections by writing the
+# beginning of the HTTP headers before calling the application. This
+# prevents calling the application for connections that have disconnected
+# while queued. This is only guaranteed to detect clients on the same
+# host unicorn runs on, and unlikely to detect disconnects even on a
+# fast LAN.
 check_client_connection false
 
 before_fork do |server, worker|
+  # Don't bother having the master process hang onto older connections.
   defined?(ActiveRecord::Base) and
     ActiveRecord::Base.connection.disconnect!
 
@@ -45,9 +60,25 @@ before_fork do |server, worker|
     rescue Errno::ENOENT, Errno::ESRCH
     end
   end
+
+  # Throttle the master from forking too quickly by sleeping. Due
+  # to the implementation of standard Unix signal handlers, this
+  # helps (but does not completely) prevent identical, repeated signals
+  # from being lost when the receiving process is busy.
+  # sleep 1
 end
 
 after_fork do |server, worker|
+  # Per-process listener ports for debugging, admin, migrations, etc..
+  # addr = "127.0.0.1:#{9293 + worker.nr}"
+  # server.listen(addr, tries: -1, delay: 5, tcp_nopush: true)
+
   defined?(ActiveRecord::Base) and
     ActiveRecord::Base.establish_connection
+
+  # If preload_app is true, then you may also want to check and
+  # restart any other shared sockets/descriptors such as Memcached,
+  # and Redis. TokyoCabinet file handles are safe to reuse
+  # between any number of forked children (assuming your kernel
+  # correctly implements pread()/pwrite() system calls).
 end

data/lib/orats/templates/includes/new/rails/public/deploy.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>The server is being updated</title>
+    <meta charset="utf-8"/>
+    <style>
+    </style>
+</head>
+
+<body>
+<h1>The server is being updated</h1>
+<p>A new version of this site is being deployed right now. Please try again in about a minute or less.</p>
+</body>
+</html>

data/lib/orats/version.rb

@@ -1,4 +1,4 @@
 # set the version of this gem
 module Orats
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -143,6 +143,7 @@ files:
 - lib/orats/templates/includes/new/rails/public/422.html
 - lib/orats/templates/includes/new/rails/public/500.html
 - lib/orats/templates/includes/new/rails/public/502.html
+- lib/orats/templates/includes/new/rails/public/deploy.html
 - lib/orats/templates/includes/new/rails/test/fixtures/accounts.yml
 - lib/orats/templates/includes/new/rails/test/models/account_test.rb
 - lib/orats/ui.rb