Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
446
Issues
446
List
Boards
Labels
Service Desk
Milestones
Merge Requests
72
Merge Requests
72
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
c15e5ad5
Commit
c15e5ad5
authored
Jun 18, 2020
by
Francis Dupont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[
#916
] Addressed comments
parent
d316d6c2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
11 deletions
+8
-11
doc/devel/config-backend.dox
doc/devel/config-backend.dox
+5
-4
doc/sphinx/arm/config.rst
doc/sphinx/arm/config.rst
+2
-2
src/bin/d2/d2_parser.yy
src/bin/d2/d2_parser.yy
+0
-1
src/bin/shell/tests/shell_process_tests.sh.in
src/bin/shell/tests/shell_process_tests.sh.in
+1
-4
No files found.
doc/devel/config-backend.dox
View file @
c15e5ad5
// Copyright (C) 2014-20
17
Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2014-20
20
Internet Systems Consortium, Inc. ("ISC")
//
// 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
...
...
@@ -81,7 +81,7 @@ The following are some details of the JSON backend framework.
option). From the implementation perspective, this is slight change
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
specific example, the following is how b10-config.db look
s today
:
specific example, the following is how b10-config.db look
ed many years ago
:
@code
{
"Init": { ... }
...
...
@@ -115,6 +115,7 @@ The following are some details of the JSON backend framework.
start, stop and reconfigure the daemons. Its only
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
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.
*/
doc/sphinx/arm/config.rst
View file @
c15e5ad5
...
...
@@ -91,11 +91,11 @@ directory.
"loggers" object) moved inside the configuration objects (maps) for the
respective Kea modules. For example: the "Dhcp4" map contains the
"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
configuration level and "loggers" objects at the module configuration
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",
"Dhcp6") in a single configuration file can be confusing and works
...
...
src/bin/d2/d2_parser.yy
View file @
c15e5ad5
...
...
@@ -701,7 +701,6 @@ control_socket_name: SOCKET_NAME {
// --- loggers entry -----------------------------------------
// is "Loggers": [ ... ].
loggers: LOGGERS {
ElementPtr l(new ListElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("loggers", l);
...
...
src/bin/shell/tests/shell_process_tests.sh.in
View file @
c15e5ad5
...
...
@@ -17,10 +17,7 @@ CONFIG="{
\"Control-agent\":
{
\"http-host\": \"127.0.0.1\",
\"http-port\": 8081
},
\"Logging\":
{
\"http-port\": 8081,
\"loggers\": [
{
\"name\": \"kea-ctrl-agent\",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment