Write unicorn stderr and stdout log
This commit is contained in:
parent
69f0cba5a6
commit
fe2a6b5f85
4 changed files with 15 additions and 1 deletions
|
|
@ -12,7 +12,7 @@
|
||||||
* Do not generate paths like `/a/b/c/config/boot.rb/../../Gemfile` to require and open things, create a proper path instead.
|
* Do not generate paths like `/a/b/c/config/boot.rb/../../Gemfile` to require and open things, create a proper path instead.
|
||||||
* Remove the hack for loading the entire lib folder with a proper solution. [#3809](https://github.com/diaspora/diaspora/issues/3750)
|
* Remove the hack for loading the entire lib folder with a proper solution. [#3809](https://github.com/diaspora/diaspora/issues/3750)
|
||||||
* Update and refactor the default public view `public/default.html` [#3811](https://github.com/diaspora/diaspora/issues/3811)
|
* Update and refactor the default public view `public/default.html` [#3811](https://github.com/diaspora/diaspora/issues/3811)
|
||||||
|
* Write unicorn stderr and stdout [#3785](https://github.com/diaspora/diaspora/pull/3785)
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,8 @@ defaults:
|
||||||
server:
|
server:
|
||||||
port: 3000
|
port: 3000
|
||||||
rails_environment: 'development'
|
rails_environment: 'development'
|
||||||
|
stderr_log:
|
||||||
|
stdout_log:
|
||||||
database: 'mysql'
|
database: 'mysql'
|
||||||
unicorn_worker: 2
|
unicorn_worker: 2
|
||||||
embed_resque_worker: false
|
embed_resque_worker: false
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,10 @@ configuration: ## Section
|
||||||
## The environment in which the server should be started by default.
|
## The environment in which the server should be started by default.
|
||||||
#rails_environment: 'production'
|
#rails_environment: 'production'
|
||||||
|
|
||||||
|
## Write unicorn stderr and stdout log
|
||||||
|
#stderr_log: '/usr/local/app/diaspora/log/unicorn-stderr.log'
|
||||||
|
#stdout_log: '/usr/local/app/diaspora/log/unicorn-stdout.log'
|
||||||
|
|
||||||
## The database type the server should use by default.
|
## The database type the server should use by default.
|
||||||
## Valid choices are 'mysql' and 'postgres'
|
## Valid choices are 'mysql' and 'postgres'
|
||||||
#database: 'mysql'
|
#database: 'mysql'
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,14 @@ timeout 30
|
||||||
#pid '/var/run/diaspora/diaspora.pid'
|
#pid '/var/run/diaspora/diaspora.pid'
|
||||||
#listen '/var/run/diaspora/diaspora.sock', :backlog => 2048
|
#listen '/var/run/diaspora/diaspora.sock', :backlog => 2048
|
||||||
|
|
||||||
|
if AppConfig.server.stderr_log.present?
|
||||||
|
stderr_path AppConfig.server.stderr_log
|
||||||
|
end
|
||||||
|
|
||||||
|
if AppConfig.server.stdout_log.present?
|
||||||
|
stdout_path AppConfig.server.stdout_log
|
||||||
|
end
|
||||||
|
|
||||||
before_fork do |server, worker|
|
before_fork do |server, worker|
|
||||||
# If using preload_app, enable this line
|
# If using preload_app, enable this line
|
||||||
ActiveRecord::Base.connection.disconnect!
|
ActiveRecord::Base.connection.disconnect!
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue