mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-24 18:57:41 +00:00
Code Issues Releases Wiki Activity

[#916] Addressed comments

Browse Source
This commit is contained in:
Francis Dupont 2020-06-18 16:29:16 +02:00
parent d316d6c2bc
commit c15e5ad5fa
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/devel/config-backend.dox
View File

@ -1,4 +1,4 @@
// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2014-2020 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
@ -81,7 +81,7 @@ The following are some details of the JSON backend framework.
option). From the implementation perspective, this is slight change option). From the implementation perspective, this is slight change
from the BIND10 days, as back then a subset of the configuration was received by from the BIND10 days, as back then a subset of the configuration was received by
the daemon processes. Nowadays the whole configuration is passed. To take a the daemon processes. Nowadays the whole configuration is passed. To take a
specific example, the following is how b10-config.db looks today: specific example, the following is how b10-config.db looked many years ago:
@code @code
{ {
"Init": { ... } "Init": { ... }
@ -115,6 +115,7 @@ The following are some details of the JSON backend framework.
start, stop and reconfigure the daemons. Its only start, stop and reconfigure the daemons. Its only
job is to pass the configuration file to each daemon and remember its PID file, so job is to pass the configuration file to each daemon and remember its PID file, so
that sending signals is possible (for configuration reload or shutdown). It is also that sending signals is possible (for configuration reload or shutdown). It is also
able to print out a status. able to print out a status.<br/><br/>
-# The capability to share the same configuration file between servers and
agents, and the Logging toplevel entry, were removed in 1.7.9.
*/ */

4
doc/sphinx/arm/config.rst
View File

@ -91,11 +91,11 @@ directory.
"loggers" object) moved inside the configuration objects (maps) for the "loggers" object) moved inside the configuration objects (maps) for the
respective Kea modules. For example: the "Dhcp4" map contains the respective Kea modules. For example: the "Dhcp4" map contains the
"loggers" object specifying logging configuration for the DHCPv4 "loggers" object specifying logging configuration for the DHCPv4
server. Backward compatibility is maintained until Kea 1.7.8 server. Backward compatibility is maintained until Kea 1.7.9
release; it will be possible to specify the "Logging" object at the top release; it will be possible to specify the "Logging" object at the top
configuration level and "loggers" objects at the module configuration configuration level and "loggers" objects at the module configuration
level. Finally, support for the top-level "Logging" object was level. Finally, support for the top-level "Logging" object was
removed in Kea 1.7.0. removed in Kea 1.7.9.
The specification of several supported elements (e.g. "Dhcp4", The specification of several supported elements (e.g. "Dhcp4",
"Dhcp6") in a single configuration file can be confusing and works "Dhcp6") in a single configuration file can be confusing and works

1
src/bin/d2/d2_parser.yy
View File

@ -701,7 +701,6 @@ control_socket_name: SOCKET_NAME {
// --- loggers entry ----------------------------------------- // --- loggers entry -----------------------------------------
// is "Loggers": [ ... ].
loggers: LOGGERS { loggers: LOGGERS {
ElementPtr l(new ListElement(ctx.loc2pos(@1))); ElementPtr l(new ListElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("loggers", l); ctx.stack_.back()->set("loggers", l);

5
src/bin/shell/tests/shell_process_tests.sh.in
View File

@ -17,10 +17,7 @@ CONFIG="{
\"Control-agent\": \"Control-agent\":
{ {
\"http-host\": \"127.0.0.1\", \"http-host\": \"127.0.0.1\",
\"http-port\": 8081 \"http-port\": 8081,
},
\"Logging\":
{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-ctrl-agent\", \"name\": \"kea-ctrl-agent\",