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
450
Issues
450
List
Boards
Labels
Service Desk
Milestones
Merge Requests
75
Merge Requests
75
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
637e9f03
Commit
637e9f03
authored
Jun 27, 2019
by
Francis Dupont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[616-error-msgs-contain-references-to-config-file-while-config-backend-is-used] Addressed comment
parent
94fd660e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/bin/dhcp4/json_config_parser.cc
src/bin/dhcp4/json_config_parser.cc
+2
-2
No files found.
src/bin/dhcp4/json_config_parser.cc
View file @
637e9f03
...
...
@@ -674,7 +674,7 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
catch
(
const
isc
::
Exception
&
ex
)
{
std
::
ostringstream
err
;
err
<<
"during update from config backend database: "
<<
ex
.
what
();
LOG_ERROR
(
dhcp4_logger
,
DHCP4_PARSER_COMMIT_FAIL
).
arg
(
(
err
.
str
()
));
LOG_ERROR
(
dhcp4_logger
,
DHCP4_PARSER_COMMIT_FAIL
).
arg
(
err
.
str
(
));
answer
=
isc
::
config
::
createAnswer
(
CONTROL_RESULT_ERROR
,
err
.
str
());
rollback
=
true
;
}
catch
(...)
{
...
...
@@ -682,7 +682,7 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
std
::
ostringstream
err
;
err
<<
"during update from config backend database: "
<<
"undefined configuration parsing error"
;
LOG_ERROR
(
dhcp4_logger
,
DHCP4_PARSER_COMMIT_FAIL
);
LOG_ERROR
(
dhcp4_logger
,
DHCP4_PARSER_COMMIT_FAIL
)
.
arg
(
err
.
str
())
;
answer
=
isc
::
config
::
createAnswer
(
CONTROL_RESULT_ERROR
,
err
.
str
());
rollback
=
true
;
}
...
...
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