esp-commons 0.0.2 → 0.0.3

data/lib/esp-commons/engine.rb

@@ -25,8 +25,9 @@ module EspCommons
     end
 
     config.before_configuration do
-      if Rails.env.production? && Settings['unicorn.prefix.logs']
-          Rails.application.config.logger = ActiveSupport::BufferedLogger.new("#{Settings['unicorn.prefix.logs']}/application.log")
+      if ENV['UNICORN']
+        log_path = Settings['unicorn.logs_dir'] || "/var/log/esp/#{Rails.root.basename}"
+        Rails.application.config.logger = ActiveSupport::BufferedLogger.new("#{log_path}/application.log")
       end
     end
 

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/esp_commons/install/bin/start_site

@@ -3,4 +3,4 @@
 source ~/.rvm/scripts/rvm
 export LANG=ru_RU.UTF-8
 
-bundle exec unicorn -c `dirname $0`/../config/unicorn.rb -E production -D
+UNICORN=true bundle exec unicorn -c `dirname $0`/../config/unicorn.rb -E production -D

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

@@ -8,22 +8,22 @@ settings['unicorn'] ||= {}
 settings['unicorn']['workers'] ||= 2
 settings['unicorn']['preload'] = true if settings['unicorn']['preload'] != false
 settings['unicorn']['timeout'] ||= 300
-settings['unicorn']['prefix'] ||= {}
-settings['unicorn']['prefix']['pid'] ||= '/var/run/esp/'
-settings['unicorn']['prefix']['logs'] ||= "/var/log/esp/#{project}/"
-settings['unicorn']['prefix']['socket'] ||= '/tmp/esp-'
-unless settings['unicorn']['prefix']['socket'].start_with? "/"
-  settings['unicorn']['prefix']['socket'] = "#{current_dir}/#{settings['unicorn']['prefix']['socket']}"
+
+settings['unicorn']['logs_dir'] ||= "/var/log/esp/#{project}"
+settings['unicorn']['pids_dir'] ||= '/var/run/esp'
+settings['unicorn']['socks_dir'] ||= '/tmp'
+unless settings['unicorn']['socks_dir'].start_with? "/"
+  settings['unicorn']['socks_dir'] = "#{current_dir}/#{settings['unicorn']['socks_dir']}"
 end
 
 worker_processes  settings['unicorn']['workers']
 preload_app       settings['unicorn']['preload']
 timeout           settings['unicorn']['timeout']
-pid               "#{settings['unicorn']['prefix']['pid']}#{project}.pid"
-stderr_path       "#{settings['unicorn']['prefix']['logs']}stderr.log"
-stdout_path       "#{settings['unicorn']['prefix']['logs']}stdout.log"
 listen            settings['unicorn']['listen'] if settings['unicorn']['listen']
-listen            "#{settings['unicorn']['prefix']['socket']}#{project}.sock", :backlog => 64
+listen            "#{settings['unicorn']['socks_dir']}/esp-#{project}.sock", :backlog => 64
+pid               "#{settings['unicorn']['pids_dir']}/#{project}.pid"
+stderr_path       "#{settings['unicorn']['logs_dir']}/stderr.log"
+stdout_path       "#{settings['unicorn']['logs_dir']}/stdout.log"
 
 before_fork do |server, worker|
   defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
-  requirement: &16836280 !ruby/object:Gem::Requirement
+  requirement: &9319660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16836280
+  version_requirements: *9319660
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &16835560 !ruby/object:Gem::Requirement
+  requirement: &9318940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16835560
+  version_requirements: *9318940
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &16834960 !ruby/object:Gem::Requirement
+  requirement: &9318320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16834960
+  version_requirements: *9318320
 - !ruby/object:Gem::Dependency
   name: russian
-  requirement: &16834220 !ruby/object:Gem::Requirement
+  requirement: &9302840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16834220
+  version_requirements: *9302840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &16818320 !ruby/object:Gem::Requirement
+  requirement: &9300820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16818320
+  version_requirements: *9300820
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3480179474796262763
+      hash: -1319495286823238883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3480179474796262763
+      hash: -1319495286823238883
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15