openteam-commons 0.0.4 → 0.0.5

data/lib/generators/openteam_commons/install/config/unicorn.rb

@@ -1,28 +1,56 @@
-current_dir = File.expand_path('../..', __FILE__)
+def current_dir
+  File.expand_path('../..', __FILE__)
+end
 
-group, project = current_dir.split('/')[-2..-1]
+def group
+  current_dir.split('/')[-2]
+end
 
-config_file_path = "#{current_dir}/config/settings.yml"
+def project
+  current_dir.split('/')[-1]
+end
 
-settings = File.exist?(config_file_path) ? YAML.load_file(config_file_path) : {}
+def config_file_path
+  "#{current_dir}/config/settings.yml"
+end
 
-settings['unicorn'] ||= {}
+def settings
+  YAML.load_file(config_file_path)['unicorn'] rescue {}
+end
 
-worker_processes  (settings['unicorn']['workers'] || 2).to_i
-timeout           (settings['unicorn']['timeout'] || 300).to_i
+def heroku?
+  ENV['PORT']
+end
+
+def pid_file
+  heroku? ? "/tmp/#{group}-#{project}.pid" : "/var/run/#{group}/#{project}.pid"
+end
+
+worker_processes  (settings['workers'] || 2).to_i
+timeout           (settings['timeout'] || 300).to_i
 preload_app       true
+pid               pid_file
 
-if ENV['PORT'] # Heroku evironment
+if heroku?
   listen            ENV['PORT'].to_i, :tcp_nopush => false
 else
   listen            "/tmp/#{group}-#{project}.sock", :backlog => 64
-  pid               "/var/run/#{group}/#{project}.pid"
+
   stdout_path       "/var/log/#{group}/#{project}/stdout.log"
   stderr_path       "/var/log/#{group}/#{project}/stderr.log"
 end
 
 before_fork do |server, worker|
   defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+
+  old_pid = "#{pid_file}.oldbin"
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+      # someone else did our job for us
+    end
+  end
 end
 
 after_fork do |server, worker|

data/lib/openteam-commons/version.rb

@@ -1,3 +1,3 @@
 module OpenteamCommons
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openteam-commons
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
-  requirement: &18618480 !ruby/object:Gem::Requirement
+  requirement: &15834820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18618480
+  version_requirements: *15834820
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &18634200 !ruby/object:Gem::Requirement
+  requirement: &15834040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18634200
+  version_requirements: *15834040
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &18633220 !ruby/object:Gem::Requirement
+  requirement: &15833260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18633220
+  version_requirements: *15833260
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &18632480 !ruby/object:Gem::Requirement
+  requirement: &15832660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18632480
+  version_requirements: *15832660
 description: Description of OpenteamCommons.
 email:
 - mail@openteam.ru
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4125852125082459204
+      hash: -3340776006057042492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4125852125082459204
+      hash: -3340776006057042492
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16