red_unicorn 1.1.5 → 1.1.6

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== v1.1.6
+* Add support for gunicorn usage
+* Restart will now defer to start if not started
+
 == v1.1.5
 * Fix argument bug to allow overriding config file location
 

data/README.rdoc

@@ -16,6 +16,7 @@ provide zero downtime restarts.
    -t, --timeout 30                       Specify timeout for running actions
    -g, --restart-grace 8                  Specify grace time to start replacement children (default: 8 seconds)
    -e, --env production                   Specify environment (default: production)
+   -k, --kind (unicorn|gunicorn)          Specify kind of unicorn in use (default: unicorn)
   Commands:
     prolicide:        Kill single worker process
     status:           Returns current unicorn status
@@ -33,6 +34,10 @@ unicorn the restart signal, it will wait until the new unicorn process has forke
 out workers before killing the original unicorn process. If no worker processes
 are started, the old unicorn process will be left running.
 
+=== Unicorn agnostic
+
+RedUnicorn is compatible with unicorn and gunicorn.
+
 == Bugs and Feature requests
 
 * Fork, make updates and send pull request
@@ -40,5 +45,5 @@ are started, the old unicorn process will be left running.
 
 == License
 
-Copyright (c) 2011 Chris Roberts <chrisroberts.code@gmail.com>
+Copyright (c) 2012 Chris Roberts <chrisroberts.code@gmail.com>
 Licensed under the MIT license (see LICENSE)

data/bin/red_unicorn

@@ -7,6 +7,7 @@ require 'red_unicorn'
 require 'red_unicorn/unicorn'
 
 opts = GetoptLong.new(
+  ['--kind', '-k', GetoptLong::REQUIRED_ARGUMENT],
   ['--pid-file', '-p', GetoptLong::REQUIRED_ARGUMENT],
   ['--unicorn-exec', '-x', GetoptLong::REQUIRED_ARGUMENT],
   ['--unicorn-config', '-c', GetoptLong::REQUIRED_ARGUMENT],
@@ -53,6 +54,7 @@ def print_help
   puts ' -t, --timeout 30                       Specify timeout for running actions'
   puts ' -g, --restart-grace 8                  Specify grace time to start replacement children (default: 8 seconds)'
   puts ' -e, --env production                   Specify environment (default: production)'
+  puts ' -k, --kind (unicorn|gunicorn)          Specify kind of unicorn in use (default: unicorn)'
   puts 'Commands:'
   max_width = ALLOWED_ACTIONS.keys.map(&:to_s).map(&:length).max + 8
   ALLOWED_ACTIONS.each_pair do |action, message|
@@ -75,6 +77,8 @@ opts.each do |opt,arg|
       unicorn_hash[:pid] = arg.to_s
     when '--env'
       unicorn_hash[:env] = arg.to_s
+    when '--kind'
+      unicorn_hash[:kind] = arg.to_s
     when '--help'
       print_help
       exit RETURN_CODES[:success]

data/lib/red_unicorn/unicorn.rb

@@ -1,4 +1,3 @@
-#TODO: Add method of checking for rouge unicorn process and killing them
 module RedUnicorn
 
   # Descriptive error classes
@@ -25,7 +24,8 @@ module RedUnicorn
         :config_path => '/etc/unicorn/app.rb',
         :action_timeout => 30,
         :restart_grace => 8,
-        :env => 'production'
+        :env => 'production',
+        :kind => 'unicorn'
       }.merge(opts)
       check_exec_path
     end
@@ -33,7 +33,7 @@ module RedUnicorn
     # Start a new unicorn process
     def start
       process_is :stopped do
-        %x{#{@opts[:exec_path]} --daemonize --env #{@opts[:env]} --config-file #{@opts[:config_path]}}
+        %x{#{@opts[:exec_path]} #{format_options}}
       end
     end
 
@@ -53,28 +53,33 @@ module RedUnicorn
 
     # Graceful restart
     def restart
-      process_is :running do
-        original_pid = pid
-        Process.kill('USR2', pid)
-        sleep(@opts[:restart_grace]) # give unicorn some breathing room
-        waited = 0
-        until((File.exists?(@opts[:pid]) && is_running? && !child_pids(pid).empty?) || waited > @opts[:action_timeout])
-          sleep_start = Time.now.to_f
-          sleep(0.2)
-          waited += Time.now.to_f - sleep_start
-        end
-        if(pid == original_pid || waited > @opts[:action_timeout])
-          raise UnicornError.new 'Failed to start new process'
-        end
-        Process.kill('QUIT', original_pid)
-        while(is_running?(original_pid) && waited < @opts[:action_timeout])
-          sleep_start = Time.now.to_f
-          sleep(0.2)
-          waited += Time.now.to_f - sleep_start
+      begin
+        process_is :running do
+          original_pid = pid
+          Process.kill('USR2', pid)
+          sleep(@opts[:restart_grace]) # give unicorn some breathing room
+          waited = 0
+          until((File.exists?(@opts[:pid]) && is_running? && !child_pids(pid).empty?) || waited > @opts[:action_timeout])
+            sleep_start = Time.now.to_f
+            sleep(0.2)
+            waited += Time.now.to_f - sleep_start
+          end
+          if(pid == original_pid || waited > @opts[:action_timeout])
+            raise UnicornError.new 'Failed to start new process'
+          end
+          Process.kill('QUIT', original_pid)
+          while(is_running?(original_pid) && waited < @opts[:action_timeout])
+            sleep_start = Time.now.to_f
+            sleep(0.2)
+            waited += Time.now.to_f - sleep_start
+          end
+          raise IsRunning.new 'Failed to stop original unicorn process' if is_running?(original_pid)
+          raise NotRunning.new 'Failed to start new unicorn process'  unless is_running?
+          reopen_logs
         end
-        raise IsRunning.new 'Failed to stop original unicorn process' if is_running?(original_pid)
-        raise NotRunning.new 'Failed to start new unicorn process'  unless is_running?
-        reopen_logs
+      rescue NotRunning
+        puts "WARN: #{@opts[:kind]} not currently running. Starting."
+        start
       end
     end
 
@@ -178,6 +183,18 @@ module RedUnicorn
         end
       end
     end
+
+    # Formats options based on kind of unicorn
+    def format_options
+      case @opts[:kind].to_sym
+      when :unicorn
+        "--daemonize --env #{@opts[:env]} --config-file #{@opts[:config_path]} --pid-file #{@opts[:pid]}"
+      when :gunicorn
+        "--daemon --config #{@opts[:config_path]} --pid #{@opts[:pid]}"
+      else
+        raise UnicornError.new("Unknown unicorn type provided (#{kind}). Supported: unicorn, gunicorn")
+      end
+    end
   end
 end
 

data/lib/red_unicorn/version.rb

@@ -13,5 +13,5 @@ module RedUnicorn
     end
   end
 
-  VERSION = Version.new('1.1.5')
+  VERSION = Version.new('1.1.6')
 end

metadata

@@ -1,86 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: red_unicorn
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.1.6
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
 platform: ruby
-authors: 
+authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-27 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: unicorn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &18527620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *18527620
 description: Unicorn Process Handler
 email: chrisroberts.code@gmail.com
-executables: 
+executables:
 - red_unicorn
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - CHANGELOG.rdoc
-files: 
+files:
 - README.rdoc
 - CHANGELOG.rdoc
 - bin/red_unicorn
 - lib/red_unicorn.rb
 - lib/red_unicorn/unicorn.rb
 - lib/red_unicorn/version.rb
-has_rdoc: true
 homepage: http://github.com/chrisroberts/red_unicorn
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Unicorn Process Handler
 test_files: []
-
+has_rdoc: