negroku 2.0.0.pre5 → 2.0.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28e09328759e8f4a35e94983b195187e2547946a
-  data.tar.gz: a86bcabcd3e51363784be9648ffc2b080fd3f571
+  metadata.gz: 8a50e3178dc8ccdc1dce8f8ce983dfba19eeade5
+  data.tar.gz: d5f480fb58ac84a329522c32ee04e7c66204e17f
 SHA512:
-  metadata.gz: 4bb0ce55d5b4ea0003ee17d6d1e29431f1014350f882a2a589965e0ba62d93c5f5d085669ff97a9b551e16de1b920b3f07741effc9bda55799afbcada1e6486c
-  data.tar.gz: 08227f2fb7e063b7f9622dd76473ae056c93952a66f6d801ab70364659c645fa30e8cecfc27284fe2ee5cc92be2b315e4a4d30de5489bf5e835e97ff9baaf221
+  metadata.gz: 014869c6a9f70ab69e226c9b041e5ab6503897c1cc80f414e0e4630bb0b0e5488b41ea0d8458250f98b7102d69b11d5725a4e93b6b06e335a43280acc4322809
+  data.tar.gz: 2ef7920ec67bc35ed978653a133e6819c160e8eeded18e5014a123ff016db90347b689078908fd9e2d9f8e4e7bddec12b1aed51c8b212375b5f488ba812b7336

data/lib/negroku/deploy.rb

@@ -20,14 +20,13 @@ end
 
 # Load Negroku tasks
 load_task "negroku"
-load_task "rbenv"     if was_required? 'capistrano/rbenv'
-load_task "nodenv"    if was_required? 'capistrano/nodenv'
-load_task "bower"     if was_required? 'capistrano/bower'
-load_task "bundler"   if was_required? 'capistrano/bundler'
-load_task "rails"     if was_required? 'capistrano/rails'
-load_task "nginx"     if was_required? 'capistrano/nginx'
-load_task "unicorn"   if was_required? 'capistrano3/unicorn'
-load_task "delayed_job"   if was_required? 'capistrano/delayed-job'
-load_task "whenever"  if was_required? 'whenever/capistrano'
-
+load_task "rbenv"             if required? 'capistrano/rbenv'
+load_task "nodenv"            if required? 'capistrano/nodenv'
+load_task "bower"             if required? 'capistrano/bower'
+load_task "bundler"           if required? 'capistrano/bundler'
+load_task "rails"             if required? 'capistrano/rails'
+load_task "nginx"             if required? 'capistrano/nginx'
+load_task "unicorn"           if required? 'capistrano3/unicorn'
+load_task "delayed_job"       if required? 'capistrano/delayed-job'
+load_task "whenever"          if required? 'whenever/capistrano'
 load_task "log"

data/lib/negroku/eye/delayed_job.rb

@@ -0,0 +1 @@
+load_task 'eye/delayed_job', ['capistrano/delayed-job']

data/lib/negroku/eye/unicorn.rb

@@ -0,0 +1,2 @@
+load_task 'eye/unicorn', ['capistrano3/unicorn']
+

data/lib/negroku/eye.rb

@@ -0,0 +1,3 @@
+require 'negroku/helpers'
+
+load_task "eye"

data/lib/negroku/helpers/templates.rb

@@ -2,6 +2,7 @@ require "erb"
 
 # Build the template
 def build_template(template, destination, binding)
+
   template_file = get_template_file(template)
 
   result = ERB.new(template_file, nil, '-').result(binding)

data/lib/negroku/helpers/watch.rb

@@ -0,0 +1,9 @@
+def watch_process(name, template = "tasks/eye/_#{name}.erb")
+  processes = fetch(:eye_watched_processes, {})
+
+  processes[name] = {
+    template: template
+  }
+
+  set :eye_watched_processes, processes
+end

data/lib/negroku/helpers.rb

@@ -1,13 +1,26 @@
 require 'negroku/helpers/templates'
+require 'negroku/helpers/watch'
 require 'negroku/helpers/logs'
 require 'negroku/helpers/env'
 
 # Find out if a specific library file was already required
-def was_required?(file)
+def required?(file)
   rex = Regexp.new("/#{Regexp.quote(file)}\.(so|o|sl|rb)?")
   $LOADED_FEATURES.find { |f| f =~ rex }
 end
 
-def load_task(name)
-  load File.join(File.dirname(__FILE__), 'tasks', "#{name}.rake")
+def any_required?(arr)
+  arr.any? { |file| required?(file) }
+end
+
+def all_required?(arr)
+  arr.all? { |file| required?(file) }
+end
+
+def load_task(name, dependencies = [])
+  if all_required? dependencies
+    load File.join(File.dirname(__FILE__), 'tasks', "#{name}.rake")
+  else
+    fail "To load #{name} you need to include #{dependencies.join ", "}"
+  end
 end

data/lib/negroku/tasks/eye/delayed_job.rake

@@ -0,0 +1,21 @@
+#########
+## Adds support to monitor delayed_job processes through eye
+#########
+
+# Watch the delayed_job processes using the build in template
+watch_process(:delayed_job);
+
+# Override start, restart and stop delayed_job tasks to so they call
+# the eye equivalents
+# namespace :unicorn do
+#   ['start','restart','stop'].each do |cmd|
+#     if Rake::Task.task_defined?("unicorn:#{cmd}")
+#       Rake::Task["unicorn:#{cmd}"].clear_actions
+#       # Reload or restart unicorn after the application is published
+#       desc "#{cmd} unicorn through eye"
+#       task cmd do
+#         invoke "eye:#{cmd}", 'unicorn'
+#       end
+#     end
+#   end
+# end

data/lib/negroku/tasks/eye/unicorn.rake

@@ -0,0 +1,21 @@
+#########
+## Adds support to monitor unicorn processes through eye
+#########
+
+# Watch the unicorn processes using the build in template
+watch_process(:unicorn);
+
+# Override start, restart and stop unicorn tasks to so they call
+# the eye equivalents
+namespace :unicorn do
+  ['start','restart','stop'].each do |cmd|
+    if Rake::Task.task_defined?("unicorn:#{cmd}")
+      Rake::Task["unicorn:#{cmd}"].clear_actions
+      # Reload or restart unicorn after the application is published
+      desc "using eye"
+      task cmd do
+        invoke "eye:#{cmd}", 'unicorn'
+      end
+    end
+  end
+end

data/lib/negroku/tasks/eye.rake

@@ -0,0 +1,87 @@
+require 'negroku/helpers/templates'
+
+## eye.rb
+#
+# Adds eye variables and tasks
+
+namespace :load do
+  task :defaults do
+    ###################################
+    ## eye template variables
+
+    # Local path to look for custom config template
+    set :eye_application_template, -> { "config/deploy/#{fetch(:stage)}/eye.rb.erb" }
+  end
+end
+
+
+namespace :eye do
+
+  desc "Loads eye config and starts monitoring"
+  task :load do
+    on release_roles fetch(:eye_roles) do
+      within "#{current_path}" do
+       execute :eye, :load, "#{shared_path}/config/eye.rb"
+      end
+    end
+  end
+
+  [:start,:restart, :info, :stop].each do |cmd|
+      # Single process
+    desc "Calls eye's #{cmd.to_s} on a process"
+    task "#{cmd}:process", [:name] do |t, args|
+      on release_roles fetch(:eye_roles) do
+        within "#{current_path}" do
+          execute :eye, cmd, "#{args[:name]}"
+        end
+      end
+    end
+    #
+    desc "Calls eye's #{cmd.to_s} on the whole app"
+    task cmd do |t, args|
+      on release_roles fetch(:eye_roles) do
+        within "#{current_path}" do
+          execute :eye, cmd, "#{fetch(:application)}"
+        end
+      end
+    end
+  end
+end
+
+# Adds some task on complement the capistrano3-unicorn tasks
+# This tasks are under the negroku namespace for easier identification
+namespace :negroku do
+
+  namespace :eye do
+
+    desc "Upload eye configuration file"
+    task :setup do
+      on release_roles fetch(:eye_roles) do
+        within "#{shared_path}/config" do
+          processes = fetch(:eye_watched_processes, {})
+
+          template_path = fetch(:eye_application_template)
+
+          # use a build in template if the template doesn't exists in the project
+          unless File.exists?(template_path)
+            template_path = "tasks/eye/application.eye.erb"
+          end
+
+          config = build_template(template_path, nil, binding)
+          upload! config, '/tmp/application.eye'
+
+          execute :mv, '/tmp/application.eye', 'eye.rb'
+        end
+      end
+    end
+
+    before "deploy:publishing", "negroku:eye:setup"
+    after "negroku:eye:setup", "eye:load"
+
+    define_logs(:eye, {
+      app: 'eye.log'
+    })
+
+  end
+
+end

data/lib/negroku/tasks/rbenv.rake

@@ -11,6 +11,9 @@ namespace :load do
 
     # Link .rbenv-vars file
     set :linked_files, fetch(:linked_files, []) << '.rbenv-vars'
+
+    # Set the path to rbenv
+    set :rbenv_path, "/home/deploy/.rbenv"
   end
 end
 
@@ -60,5 +63,14 @@ namespace :rbenv do
       end
     end
 
+    before 'rbenv:vars:add', 'env:changed'
+    before 'rbenv:vars:remove', 'env:changed'
+
+  end
+end
+
+namespace :env do
+  desc 'Env variables changed'
+  task :changed do
   end
 end

data/lib/negroku/tasks/unicorn.rake

@@ -15,6 +15,8 @@ namespace :load do
     # Defines where the unicorn pid will live.
     set :unicorn_pid, -> { "#{shared_path}/tmp/pids/unicorn.pid" }
 
+    set :unicorn_log, -> { "#{shared_path}/log/unicorn.log" }
+
     set :unicorn_config_path, -> { "#{shared_path}/config/unicorn.rb" }
 
     ###################################
@@ -46,7 +48,7 @@ namespace :load do
     ## capistrano3/nginx variables
 
     # Set the app server socket if nginx is being used
-    set :app_server_socket, -> { fetch(:unicorn_socket) } if was_required? 'capistrano/nginx'
+    set :app_server_socket, -> { fetch(:unicorn_socket) } if required? 'capistrano/nginx'
 
   end
 end
@@ -78,7 +80,13 @@ namespace :negroku do
     # Reload or restart unicorn after the application is published
     after 'deploy:publishing', 'restart' do
       invoke 'negroku:unicorn:setup'
-      invoke fetch(:unicorn_preload)? 'unicorn:restart' : 'unicorn:reload'
+      invoke 'unicorn:restart'
+    end
+
+    before 'env:changed', 'hard-restart' do
+      invoke 'unicorn:stop'
+      sleep 5
+      invoke 'unicorn:start'
     end
 
     # Ensure the folders needed exist

data/lib/negroku/templates/negroku/Capfile.erb

@@ -28,6 +28,11 @@ require 'capistrano/nginx'
 require 'capistrano/delayed-job'
 require 'whenever/capistrano'
 
+# Eye monitoring
+require 'negroku/eye'
+require 'negroku/eye/unicorn'
+require 'negroku/eye/delayed-job'
+
 # NEGROKU
 # Includes negroku defaults and tasks
 require 'negroku/deploy'

data/lib/negroku/templates/tasks/eye/_delayed_job.erb

@@ -0,0 +1,28 @@
+cwd = File.expand_path(File.join(File.dirname(__FILE__), %w[ ../ ../ ]))
+
+config_path = File.join(cwd, %w{ config dj.yml } )
+
+workers_count = if File.exists?(config_path)
+  YAML.load_file(config_path).try(:[], :workers) || 5
+else
+  5
+end
+
+Eye.application 'delayed_job' do
+  working_dir cwd
+  stop_on_delete true
+
+  group 'dj' do
+    chain grace: 5.seconds
+
+    (1 .. workers_count).each do |i|
+      process "dj-#{i}" do
+        pid_file "tmp/pids/delayed_job.#{i}.pid"
+        start_command "rake jobs:work"
+        daemonize true
+        stop_signals [:INT, 30.seconds, :TERM, 10.seconds, :KILL]
+        stdall "log/dj-#{i}.log"
+      end
+    end
+  end
+end

data/lib/negroku/templates/tasks/eye/_unicorn.erb

@@ -0,0 +1,27 @@
+  RAILS_ENV="<%= fetch(:rails_env) %>"
+
+  process 'unicorn' do
+    env rbenv_root: "<%= fetch(:rbenv_path) %>", rbenv_version: "<%=fetch(:rbenv_ruby) %>"
+    pid_file "<%= fetch(:unicorn_pid) %>"
+    start_command "<%= fetch(:rbenv_prefix) %> bundle exec unicorn -Dc <%= fetch(:unicorn_config_path) %> -E #{RAILS_ENV}"
+    stdall "<%= fetch(:unicorn_log) %>"
+
+    # stop signals:
+    # http://unicorn.bogomips.org/SIGNALS.html
+    stop_signals [:TERM, 10.seconds]
+
+    # soft restart
+    restart_command "kill -USR2 {PID}"
+
+    check :cpu, :every => 30, :below => 80, :times => 3
+    check :memory, :every => 30, :below => 150.megabytes, :times => [3,5]
+
+    start_timeout 100.seconds
+    restart_grace 30.seconds
+
+    monitor_children do
+      stop_command "kill -QUIT {PID}"
+      check :cpu, :every => 30, :below => 80, :times => 3
+      check :memory, :every => 30, :below => 150.megabytes, :times => [3,5]
+    end
+  end

data/lib/negroku/templates/tasks/eye/application.eye.erb

@@ -0,0 +1,26 @@
+require 'eye-http'
+
+# Setups Eye global conf if not already
+Eye.config do
+  logger '/var/log/eye-global.log'
+  http :enable => true, :host => "0.0.0.0", :port => 12345
+end
+
+# Adding application
+Eye.application '<%= fetch(:application)%>' do
+
+  # All options inherits down to the config leafs.
+  # except `env`, which merging down
+
+  stdall '<%= shared_path %>/log/eye.log'
+  working_dir '<%= current_path %>'
+
+  trigger :flapping, times: 10, within: 1.minute, retry_in: 10.minutes
+
+  check :cpu, every: 10.seconds, below: 100, times: 3 # global check for all processes
+
+<% processes.each do |process_name, options| -%>
+<%= partial options[:template], binding %>
+<% end -%>
+
+end

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = '2.0.0.pre5'
+  VERSION = '2.0.0.pre6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre5
+  version: 2.0.0.pre6
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -302,17 +302,24 @@ files:
 - lib/negroku/cli/env.rb
 - lib/negroku/cli/stage.rb
 - lib/negroku/deploy.rb
+- lib/negroku/eye.rb
+- lib/negroku/eye/delayed_job.rb
+- lib/negroku/eye/unicorn.rb
 - lib/negroku/formatters/simple.rb
 - lib/negroku/helpers.rb
 - lib/negroku/helpers/app_directory.rb
 - lib/negroku/helpers/env.rb
 - lib/negroku/helpers/logs.rb
 - lib/negroku/helpers/templates.rb
+- lib/negroku/helpers/watch.rb
 - lib/negroku/i18n.rb
 - lib/negroku/locales/en.yml
 - lib/negroku/tasks/bower.rake
 - lib/negroku/tasks/bundler.rake
 - lib/negroku/tasks/delayed_job.rake
+- lib/negroku/tasks/eye.rake
+- lib/negroku/tasks/eye/delayed_job.rake
+- lib/negroku/tasks/eye/unicorn.rake
 - lib/negroku/tasks/log.rake
 - lib/negroku/tasks/negroku.rake
 - lib/negroku/tasks/nginx.rake
@@ -324,6 +331,9 @@ files:
 - lib/negroku/templates/negroku/Capfile.erb
 - lib/negroku/templates/negroku/deploy.rb.erb
 - lib/negroku/templates/negroku/stage.rb.erb
+- lib/negroku/templates/tasks/eye/_delayed_job.erb
+- lib/negroku/templates/tasks/eye/_unicorn.erb
+- lib/negroku/templates/tasks/eye/application.eye.erb
 - lib/negroku/templates/tasks/unicorn_rails.rb.erb
 - lib/negroku/templates/tasks/unicorn_rails_activerecord.rb.erb
 - lib/negroku/version.rb