Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-08 06:08:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-08 06:08:47 +0300
commit91ed938e3d17d385a08459915972d7e3f6b8468e (patch)
tree194203988e612d82afbcc20f9aaf06ab6a451b39 /config/unicorn.rb.example
parentbef1bd93d113723a156f5943e743193afad1ef71 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/unicorn.rb.example')
-rw-r--r--config/unicorn.rb.example5
1 files changed, 5 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