unicorn-ctl 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzBlYWViYjZjZTJlYmE5MzM2NGI1NTUyOTg1Nzc4OGQyN2U1YzM1NA==
-  data.tar.gz: !binary |-
-    OTE3OTY0ZDM3NmNlMTIxMTA2MjczZjBhM2VkMmYzYWUwMjc2Yjg4MA==
+SHA1:
+  metadata.gz: 99271b94461638a70498a24de7dffe38ef228022
+  data.tar.gz: 935d288070fd63c99bb7f9ea8f79ef3bacee5405
 SHA512:
-  metadata.gz: !binary |-
-    MzJlYmQyMWMyNGY2MGEwODY3NDYzMzk0MGYwNTlkYjJlOGE0ZWVlMmQ3MGQ0
-    MmQwZDY5YzFiZDMzOWMxOWNhMTIxZjY2ZGRmZGNjMmQ0M2FiOGY5ZWE0MWRj
-    ZDY4ZjhiZGJlZWM1ZjM2Y2FlZmQyMTY0NmM1OTliNDNmYmY5NDk=
-  data.tar.gz: !binary |-
-    NTY0MmJiNWU1YjM4MDE1NjJkNzY1OWM3ODdiOGYzYzJmOTA3MDU2M2Y0OWQx
-    ZGE5ODc3MWRjZGIxNGU4NmFhNjUwMjgzMTk0NWYzYjk2NTgwMWQ4OTY1NWZi
-    N2FlMWNiYjI5MWJkYjEzYTJlNTQ2OTJmMTdiMWU5MTUwNTY3NGM=
+  metadata.gz: 0dad00539469ef82c81a22be57c0eb49640483dfaea77ab004f63f32bd98710a1be5617396d101c7b70d5c73fe58eb80f3d439687d1c4980c212a34ce4d57d72
+  data.tar.gz: 14856718dbd85f76bd13e195ff523aacbf677308695021f70afc8fc6b0cdc5ce84352ddec1e57a77de916a8de779348c7184ac19db072daaef6cabaa371d89e0

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## UnicornCtl Changelog
 
-### 0.1.3 / Not released yet
+### 0.1.4 / 2014-02-20
+
+* Add a wait period after upgrade/start to make sure new master has a chance to start before we perform a health check on it.
+* Add an option for the script to watch new master process until its proctitle changes.
+
+### 0.1.3 / 2013-09-17
 
 * Fix unicorn upgrades: really wait for the new master to replace the old one.
 

data/bin/unicornctl

@@ -60,6 +60,15 @@ def escape(param)
   Shellwords.escape(param)
 end
 
+def wait_with_timeout(timeout, sleep_time = 1, &block)
+  raise "No block given" unless block_given?
+  start_time = Time.now
+  while Time.now - start_time < timeout do
+    block.call
+    sleep(sleep_time)
+  end
+end
+
 #-------------------------------------------------------------------------------------------
 # Check if process is still running
 def pid_running?(pid)
@@ -85,11 +94,9 @@ end
 
 def wait_for_pid_to_die(pid, timeout)
   print "Waiting for the process to stop: "
-  start_time = Time.now
-  while Time.now - start_time < timeout
+  wait_with_timeout(timeout) do
     print "."
     break unless pid_running?(pid)
-    sleep(1)
   end
 end
 
@@ -108,6 +115,13 @@ def stop_unicorn_process(pid, timeout, graceful)
   end
 end
 
+def process_title(pid)
+  return nil unless pid_running?(pid)
+  cmdline_file = "/proc/#{pid}/cmdline"
+  return nil unless File.readable?(cmdline_file)
+  return File.read(cmdline_file).strip
+end
+
 #---------------------------------------------------------------------------------------------------
 # Kills a process and all of its descendants
 def kill_tree(pid)
@@ -218,6 +232,12 @@ def start_application!(options)
     exit(1)
   end
 
+  # Wait for a while to let the new master start
+  if options[:start_wait] > 0
+    puts "Waiting for #{options[:start_wait]} seconds to let the new master load completely..."
+    sleep(options[:start_wait])
+  end
+
   # If we have a health check url, let's check it
   if options[:check_url]
     exit(1) unless check_app_health(options)
@@ -313,10 +333,8 @@ def upgrade_application!(options)
   puts "Waiting for the new master to replace the old one..."
 
   # Wait for the new master to start
-  start_time = Time.now
   new_started = false
-  while Time.now - start_time < options[:timeout]
-    sleep(1)
+  wait_with_timeout(options[:timeout]) do
     new_pid = File.exists?(pid_file) ? read_pid(pid_file) : nil
     if new_pid && new_pid != old_pid
       new_started = true
@@ -335,6 +353,30 @@ def upgrade_application!(options)
   new_pid = read_pid(pid_file)
   puts "New master detected with pid=#{new_pid}"
 
+  # Just in case we were asked to watch master proctitle, save its current content
+  master_proctitle = process_title(new_pid)
+  if options[:watch_proctitle]
+    puts "New master process #{new_pid} title: #{master_proctitle}"
+  end
+
+  # Wait for a while to let the new master start
+  if options[:start_wait] > 0
+    puts "Waiting for #{options[:start_wait]} seconds to let the new master load completely..."
+    sleep(options[:start_wait])
+  end
+
+  # If we're asked to watch proctitle, let's wait for the title to change
+  if options[:watch_proctitle]
+    puts "Waiting for process title to change for master process #{new_pid}..."
+    wait_with_timeout(options[:timeout]) do
+      cur_title = process_title(new_pid)
+      if master_proctitle != cur_title
+        puts "Master process #{new_pid} new title: #{cur_title}"
+        break
+      end
+    end
+  end
+
   # If we have a health check url, let's check it
   if options[:check_url]
     if check_app_health(options)
@@ -351,6 +393,15 @@ def upgrade_application!(options)
   puts "Stopping old unicorn master: #{old_pid}"
   stop_unicorn_process(old_pid, options[:timeout], true)
 
+  # If we have a health check url, let's pefrorm the final check
+  if options[:check_url]
+    puts "Performing the final health check..."
+    unless check_app_health(options)
+      puts "ERROR: Final health check failed!"
+      exit(1)
+    end
+  end
+
   # All done!
   puts "OK: Upgrade is done successfully!"
 end
@@ -409,10 +460,12 @@ def show_help(error = nil)
   puts '  --health-check-url=url         | -H url     Health check URL used to make sure the app has started'
   puts '  --health-check-content=string  | -C string  Health check expected content (default: just check for HTTP 200 OK)'
   puts '  --health-check-timeout=sec     | -T sec     Individual health check timeout (default: 5 sec)'
+  puts '  --start-wait=sec               | -w sec     New master startup wait (default: 5 sec, use 0 to disable)'
   puts '  --timeout=sec                  | -t sec     Operation (start/stop/etc) timeout (default: 30 sec)'
   puts '  --unicorn-config=file          | -c file    Unicorn config file to use, absolute or relative path (default: shared/unicorn.rb)'
   puts '  --rackup-config=file           | -r file    Rackup config file to use, absolute or relative path (default: current/config.ru)'
   puts '  --pid-file=file                | -p file    PID-file unicorn is configured to use (default: shared/pids/unicorn.pid)'
+  puts '  --watch-proctitle              | -W         Watch new master proctitle until it changes, which usually means it has finished loading'
   puts '  --rainbows                     | -R         Use rainbows to start the app (default: use unicorn)'
   puts '  --help                         | -h         This help'
   puts
@@ -427,10 +480,12 @@ opts = GetoptLong.new(
   [ '--health-check-url',     '-U', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--health-check-content', '-C', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--health-check-timeout', '-T', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '--start-wait',           '-w', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--timeout',              '-t', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--unicorn-config=file',  '-c', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--rackup-config=file',   '-r', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--pid-file=file',        '-p', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '--watch-proctitle',      '-W', GetoptLong::NO_ARGUMENT ],
   [ '--rainbows',             '-R', GetoptLong::NO_ARGUMENT ],
   [ '--help',                 '-h', GetoptLong::NO_ARGUMENT ]
 )
@@ -443,10 +498,12 @@ options = {
   :env => 'development',
   :timeout => 30,
   :check_timeout => 5,
+  :start_wait => 5,
   :unicorn_bin => 'unicorn',
   :pid_file => nil,
   :rackup_config => nil,
-  :unicorn_config => nil
+  :unicorn_config => nil,
+  :watch_proctitle => false
 }
 
 # Process options
@@ -470,6 +527,9 @@ opts.each do |opt, arg|
     when "--health-check-timeout"
       options[:check_timeout] = arg.to_i
 
+    when "--start-wait"
+      options[:start_wait] = arg.to_i
+
     when "--unicorn-config"
       options[:unicorn_config] = arg.strip
 
@@ -479,6 +539,14 @@ opts.each do |opt, arg|
     when "--pid-file"
       options[:pid_file] = arg.strip
 
+    when "--watch-proctitle"
+      # Try to get pid for self
+      if process_title(Process.pid)
+        options[:watch_proctitle] = true
+      else
+        puts "WARNING: Proctitle checking is not supported on this platform!"
+      end
+
     when "--rainbows"
       options[:unicorn_bin] = 'rainbows'
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-ctl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Oleksiy Kovyrin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A script to control unicorn instances.
@@ -46,10 +46,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/unicornctl
-- LICENSE.txt
 - CHANGELOG.md
+- LICENSE.txt
 - README.md
+- bin/unicornctl
 homepage: https://github.com/swiftype/unicorn-ctl
 licenses:
 - MIT
@@ -60,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Start/stop/restart/upgrade unicorn instances reliably.