diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-08 03:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-08 03:08:47 +0000 |
| commit | 91ed938e3d17d385a08459915972d7e3f6b8468e (patch) | |
| tree | 194203988e612d82afbcc20f9aaf06ab6a451b39 /config | |
| parent | bef1bd93d113723a156f5943e743193afad1ef71 (diff) | |
| download | gitlab-ce-91ed938e3d17d385a08459915972d7e3f6b8468e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/unicorn.rb.example | 5 | ||||
| -rw-r--r-- | config/unicorn.rb.example.development | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 9f13fac5cca..77e440eddde 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -82,6 +82,7 @@ preload_app true check_client_connection false require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" +require_relative "/home/git/gitlab/lib/gitlab/log_timestamp_formatter.rb" before_exec do |server| # Signal application hooks that we're about to restart @@ -137,3 +138,7 @@ after_fork do |server, worker| # addr = "127.0.0.1:#{9293 + worker.nr}" # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) end + +# Configure the default logger to use a custom formatter that formats the +# timestamps to be in UTC and in ISO8601.3 format +Configurator::DEFAULTS[:logger].formatter = Gitlab::LogTimestampFormatter.new diff --git a/config/unicorn.rb.example.development b/config/unicorn.rb.example.development index 92bb1c7344a..2c6e809f753 100644 --- a/config/unicorn.rb.example.development +++ b/config/unicorn.rb.example.development @@ -15,6 +15,7 @@ preload_app true check_client_connection false require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" +require_relative "/home/git/gitlab/lib/gitlab/log_timestamp_formatter.rb" before_exec do |server| # Signal application hooks that we're about to restart @@ -70,3 +71,7 @@ after_fork do |server, worker| # addr = "127.0.0.1:#{9293 + worker.nr}" # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) end + +# Configure the default logger to use a custom formatter that formats the +# timestamps to be in UTC and in ISO8601.3 format +Configurator::DEFAULTS[:logger].formatter = Gitlab::LogTimestampFormatter.new |