unicorn-ctl 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6493e6ab1f002e3e8e334c403e29a5ec3e3552a1
-  data.tar.gz: 48acfe52ffe52808933727b864c5b86e8f59f058
+  metadata.gz: 9942b7c093975e739c080458689d9878472570f4
+  data.tar.gz: 15291d5de03286c8d20fffb1806adef9a2f06a9f
 SHA512:
-  metadata.gz: 178cafb7c8f6914d1f6e877269df0a15775919b08181b44f7dc5cbeb2475216137321884e80242b269abf5fa8883f75da8709a6b5e25108a7bc2e87b3f3fd49f
-  data.tar.gz: d070792765a6f0fc0ac1faf0638e24b46f68c84ab98a48c85e24d534f7d4fd91c02e66494814abe24fb858ba2899f6e1c88db03a3624b3cf4f7a8aca656ad8ee
+  metadata.gz: ad78f2f23d649ebde54da12e234bd96057b18e33f367de5a8a909a2c4b4114dc3669ede418f93a4ac92e5dbe0923c3cc59424bae575371d3fee9d5eb72c159f8
+  data.tar.gz: 73285fb1268571d33589301e695134013ab0e135307e03ae1b3cd0e58f1e78baed5d778cf6723f95ccf0db6b9a15dd4a26118892d64d5062d39823d5c7153429

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## UnicornCtl Changelog
 
+### 0.1.6 / 2014-06-18
+
+* Do not follow recirects when performing a health check and handle all 1xx/2xx/3xx as success.
+* When pid file is empty, treat it as a stale one.
+
 ### 0.1.5 / 2014-02-21
 
 * Fix --unicorn-config/--rackup-config/--pid-file options handling.

data/README.md

@@ -63,7 +63,7 @@ The following command are supported at the moment:
 * `status` - Display current application server status. If the server is up, the command exits with exit
   code 0, otherwise the exit code will be 1.
 
-For more information on unicorn procss management you could check their
+For more information on unicorn process management you could check their
 [official documentation page](http://unicorn.bogomips.org/SIGNALS.html).
 
 ### License

data/bin/unicornctl

@@ -69,17 +69,22 @@ def wait_with_timeout(timeout, sleep_time = 1, &block)
   end
 end
 
-#-------------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------------
 # Check if process is still running
 def pid_running?(pid)
-  begin
-    Process.kill(0, pid)
-    return true
-  rescue Errno::ESRCH
-    return false
-  rescue ::Exception   # for example on EPERM (process exists but does not belong to us)
-    return true
-  end
+  # Make sure PID is correct
+  pid = pid.to_i
+  return false if pid <= 0
+
+  # Check if the process exists
+  Process.kill(0, pid)
+  return true
+
+rescue Errno::ESRCH  # Process does not exist
+  return false
+
+rescue ::Exception   # for example on EPERM (process exists but does not belong to us)
+  return true
 end
 
 def send_signal(signal, pid)
@@ -139,14 +144,15 @@ def check_app_health(options)
     sleep(1)
 
     response = begin
-      HTTParty.get(options[:check_url], :timeout => options[:check_timeout])
+      HTTParty.get(options[:check_url], :timeout => options[:check_timeout], :no_follow => true)
     rescue Timeout::Error => e
       puts "Health check timed out after #{options[:check_timeout]} seconds. Retrying..."
       next
     end
 
-    if response.code.to_i / 100 == 2
-      puts "Health check succeeded with code: #{response.code}"
+    code = response.code.to_i
+    if 100 <= code && code < 400
+      puts "Health check succeeded with code: #{code}"
       if options[:check_content]
         if response.body.match(options[:check_content])
           puts "Content check succeeded, found content in response body: #{options[:check_content]}"
@@ -458,7 +464,7 @@ def show_help(error = nil)
   puts '  --app-dir=dir                  | -d dir     Base directory for the application (required)'
   puts '  --environment=name             | -e name    RACK_ENV to use for the app (default: development)'
   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-content=string  | -C string  Health check expected content (default: just check for HTTP 1xx/2xx/3xx)'
   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)'

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-ctl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Oleksiy Kovyrin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-06-18 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.
@@ -60,18 +60,19 @@ 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.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Start/stop/restart/upgrade unicorn instances reliably.
 test_files: []
+has_rdoc: