unicorn-rails 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e2d67195fb3e46f8376736a2b745ead885b1ff
-  data.tar.gz: 548b9cfac1b06c8b5c7327260d6dc043a9cda51e
+  metadata.gz: be441611f4be3c457fe383d9a7eb7e79b3e75b14
+  data.tar.gz: 001b9519af7d23c92df2e6f1cf8a1757f22d7a2b
 SHA512:
-  metadata.gz: a7b0192d1ac7e248cdf58d1abe1438c9f391ccb57b39b17f833091bd07fbc3fba980717ad8c94015a28545e96c1c6721b41c0e0c9c31bbd9d097378221c10466
-  data.tar.gz: c234fdbdc91bf3c181b3b7db4d2d376c33dac39f144b043666781b73665418ef248ca56e60d797098639ea585c453bc6da2f4077fe202cf7cffc696b2fb7e25f
+  metadata.gz: 06b6612a02a1138f530174de67981c0bfe07fa313129f6f9b1ed8330209fdb1688ef00051e72e9611beb35bc4a39a511e31b24f4347e34603872f7d42fa64ef6
+  data.tar.gz: b784f16e273d614da9eb76ab70f3e2252322fd53e9e4f747c225021934a38da060483d633eae2b4cafd4866bafb03ed6ee42897f3b46146218da7feb73ff18d6

data/lib/unicorn_rails.rb

@@ -10,18 +10,25 @@ module Rack
     class Unicorn
       class << self
         def run(app, options = {})
-          unicorn_options = {}
+          unicorn_options = {
+            :listeners => ["#{options[:Host]}:#{options[:Port]}"]
+          }
 
           if ::File.exist?("config/unicorn/#{environment}.rb")
             unicorn_options[:config_file] = "config/unicorn/#{environment}.rb"
           elsif ::File.exist?("config/unicorn.rb")
             unicorn_options[:config_file] = "config/unicorn.rb"
           else
-            unicorn_options[:listeners] = ["#{options[:Host]}:#{options[:Port]}"]
             unicorn_options[:timeout] = 31 * 24 * 60 * 60
             unicorn_options[:worker_processes] = (ENV["UNICORN_WORKERS"] || "1").to_i
           end
 
+          if unicorn_options[:config_file]
+            if ::File.read(unicorn_options[:config_file]) =~ /^(\s+)listen\s/
+              unicorn_options.delete(:listeners)
+            end
+          end
+
           ::Unicorn::Launcher.daemonize!(unicorn_options) if options[:daemonize]
           ::Unicorn::HttpServer.new(app, unicorn_options).start.join
         end

data/lib/unicorn_rails/version.rb

@@ -1,3 +1,3 @@
 module UnicornRails
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Samuel Kadolph
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack