Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
05b30e40
Commit
05b30e40
authored
Jun 08, 2015
by
Shawn Routhier
Browse files
[trac3808] Updates per review comments
parent
2becffcd
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/bin/d2/d2_log.cc
View file @
05b30e40
...
...
@@ -21,8 +21,8 @@ namespace d2 {
/// @brief Defines the logger used within D2.
isc
::
log
::
Logger
dctl_logger
(
"dhcpddns"
);
isc
::
log
::
Logger
dhcp_to_d2_logger
(
"dchp
_
to
_
d2"
);
isc
::
log
::
Logger
d2_to_dns_logger
(
"d2
_
to
_
dns"
);
isc
::
log
::
Logger
dhcp_to_d2_logger
(
"dchp
-
to
-
d2"
);
isc
::
log
::
Logger
d2_to_dns_logger
(
"d2
-
to
-
dns"
);
}
// namespace d2
}
// namespace isc
...
...
src/bin/d2/nc_trans.h
View file @
05b30e40
...
...
@@ -441,8 +441,10 @@ public:
/// @brief Fetches the request id that identifies this transaction.
///
/// This is a wrapper around getRequestID which currently returns DHCID
/// in the future we may include a distinct request id.
/// This is a wrapper around getRequestId from the NCR which currently
/// returns DHCID. In the future we may include a distinct request id.
/// The primary purpose of this function is to provide a consistent way
/// to identify requests for logging purposes.
///
/// @return a string with the the request's request ID (currently DHCID)
std
::
string
getRequestId
()
const
;
...
...
src/bin/d2/tests/nc_trans_unittests.cc
View file @
05b30e40
...
...
@@ -452,7 +452,7 @@ TEST(NameChangeTransaction, construction) {
}
/// @brief General testing of member accessors.
/// Most if not all of these are also tested as a byproduct of
f
larger tests.
/// Most if not all of these are also tested as a byproduct of larger tests.
TEST_F
(
NameChangeTransactionTest
,
accessors
)
{
NameChangeStubPtr
name_change
;
ASSERT_NO_THROW
(
name_change
=
makeCannedTransaction
());
...
...
src/lib/dhcp_ddns/ncr_msg.h
View file @
05b30e40
...
...
@@ -588,7 +588,9 @@ public:
/// @todo Currently this is the DHCID, in the future we may add a unique ID per
/// request to allow for correlating messages and events between the DHCP servers
/// and the D2 server. If we do that we shall also need to add or update other
/// functions to: set the request ID, add it to the JSON strings, etc.
/// functions to: set the request ID, add it to the JSON strings, etc. The
/// primary purpose of this function is to provide a consistent way to identify
/// requests for logging purposes.
///
/// @return a string with the the request's request ID (currently DHCID)
std
::
string
getRequestId
()
const
{
...
...
src/lib/dhcp_ddns/tests/ncr_unittests.cc
View file @
05b30e40
...
...
@@ -493,7 +493,7 @@ TEST(NameChangeRequestTest, basicJsonTest) {
// Verify that the request ID matches the string from the DHCID.
std
::
string
dhcid_str
=
"010203040A7F8E3D"
;
EXPECT_EQ
(
ncr
->
getRequestId
()
,
dhcid_str
);
EXPECT_EQ
(
dhcid_str
,
ncr
->
getRequestId
());
}
/// @brief Tests a variety of invalid JSON message strings.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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