From: Thomas Markwalder Date: Mon, 2 Mar 2020 14:32:17 +0000 (-0500) Subject: [#1115] Updated doc and added ChangeLog X-Git-Tag: Kea-1.7.6~94 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dba1a95e244f139feaa18c3cd33cc6d68748701;p=thirdparty%2Fkea.git [#1115] Updated doc and added ChangeLog modified: ChangeLog doc/sphinx/api/shutdown.json doc/sphinx/arm/ctrl-channel.rst --- diff --git a/ChangeLog b/ChangeLog index dda88b5ed5..b493e666c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1727. [bug] tmark + When shutting down due to lost backend database connetivity, + kea-dhcp4 and kea-dhcp6 processes will exit with a non-zero value. + This was temporarily altered by #1108. In addition, the "shutdown" + command now supports an "exit-value" argument. + (Gitlab #1115) + 1726. [func] razvan Handling SKIP and DROP state in hooks so that the same operation is not performed multiple times. Some hooks will throw exceptions diff --git a/doc/sphinx/api/shutdown.json b/doc/sphinx/api/shutdown.json index f3c05835bb..0c6c8e7311 100644 --- a/doc/sphinx/api/shutdown.json +++ b/doc/sphinx/api/shutdown.json @@ -9,6 +9,9 @@ "cmd-syntax": [ "{", " \"command\": \"shutdown\"", + " \"arguments\": {", + " \"exit-value\": 123", + " }", "}" ], "description": "See ", diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst index 36ca31b126..78b0f0d725 100644 --- a/doc/sphinx/arm/ctrl-channel.rst +++ b/doc/sphinx/arm/ctrl-channel.rst @@ -496,10 +496,15 @@ may look like this: { "command": "shutdown" + "arguments": { + "exit-value": 3 + } } The server responds with a confirmation that the shutdown procedure has -been initiated. +been initiated. The optional parameter, "exit-value", specifies the +numeric value with which the server process will exit to the OS. The +default value is zero. .. _command-dhcp-disable: