From 95a8f7ec7eef7a6e0a2dad904359199bb9bac6aa Mon Sep 17 00:00:00 2001
From: ocelot-inc <pgulutzan@ocelot.ca>
Date: Wed, 6 Jan 2016 12:00:36 -0700
Subject: [PATCH] Server signal handling
---
doc/sphinx/book/administration.rst | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/doc/sphinx/book/administration.rst b/doc/sphinx/book/administration.rst
index 990c59d259..236d7c94c0 100644
--- a/doc/sphinx/book/administration.rst
+++ b/doc/sphinx/book/administration.rst
@@ -9,15 +9,17 @@ reloading configuration, taking snapshots, log rotation.
Server signal handling
=====================================================================
-The server is configured to shut down gracefully on SIGTERM and SIGINT
-(keyboard interrupt). SIGUSR1 can be used to save a snapshot. All
-other signals are blocked or ignored. The signals are processed in the main
-thread event loop. Thus, if the control flow never reaches the event loop
-(thanks to a runaway stored procedure), the server stops responding to any
-signal, and can only be killed with SIGKILL (this signal can not be ignored).
-
-SIGHUP can be used to cause a log file rotation. See
-:ref:`the example in section "Logging" <logging_example>`.
+The server processes these signals during the main thread event loop: |br|
+SIGHUP: may cause log file rotation, see :ref:`the example in section "Logging" <logging_example>`. |br|
+SIGUSR1: may cause saving of a snapshot, see the description of :func:`box.snapshot`. |br|
+SIGTERM: may cause graceful shutdown (information will be saved first). |br|
+SIGINT also known as keyboard interrupt: may cause graceful shutdown. |br|
+SIGKILL: causes shutdown. |br|
+
+Other signals will result in behavior defined by the operating system.
+Signals other than SIGKILL may be ignored, especially if the
+server is executing a long-running procedure which
+prevents return to the main thread event loop.
=====================================================================
--
GitLab