summaryrefslogtreecommitdiff
path: root/doc/administration/operations/unicorn.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-03 03:08:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-03 03:08:30 +0000
commitf4d27d532e3abeecd1caffeb3a56e698ae982e5b (patch)
tree27a1b43761cd6eedbdbf57b46b8fd9c5cc519a61 /doc/administration/operations/unicorn.md
parenta2a712139fc7fa58aa02b143f2767286d28ef28d (diff)
downloadgitlab-ce-f4d27d532e3abeecd1caffeb3a56e698ae982e5b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/operations/unicorn.md')
-rw-r--r--doc/administration/operations/unicorn.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/operations/unicorn.md b/doc/administration/operations/unicorn.md
index 969f1211643..a19617daaef 100644
--- a/doc/administration/operations/unicorn.md
+++ b/doc/administration/operations/unicorn.md
@@ -29,7 +29,7 @@ requests.
This is what a Unicorn worker timeout looks like in `unicorn_stderr.log`. The
master process has PID 56227 below.
-```
+```plaintext
[2015-06-05T10:58:08.660325 #56227] ERROR -- : worker=10 PID:53009 timeout (61s > 60s), killing
[2015-06-05T10:58:08.699360 #56227] ERROR -- : reaped #<Process::Status: pid 53009 SIGKILL (signal 9)> worker=10
[2015-06-05T10:58:08.708141 #62538] INFO -- : worker=10 spawned pid=62538
@@ -79,7 +79,7 @@ threshold is a random value between 200 and 250 MB. The master process (PID
117565) then reaps the worker process and spawns a new 'worker 4' with PID
127549.
-```
+```plaintext
[2015-06-05T12:07:41.828374 #125918] WARN -- : #<Unicorn::HttpServer:0x00000002734770>: worker (pid: 125918) exceeds memory limit (256413696 bytes > 254802235 bytes)
[2015-06-05T12:07:41.828472 #125918] WARN -- : Unicorn::WorkerKiller send SIGQUIT (pid: 125918) alive: 23 sec (trial 1)
[2015-06-05T12:07:42.025916 #117565] INFO -- : reaped #<Process::Status: pid 125918 exit 0> worker=4