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
414a83fe
Commit
414a83fe
authored
Oct 26, 2012
by
Michal 'vorner' Vaner
Browse files
[2209] Rename ZONE_RELOADED
Since it is not used for reloading a zone only. It is now ZONE_SUCCESS.
parent
6ead8f2b
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/bin/auth/command.cc
View file @
414a83fe
...
...
@@ -203,7 +203,7 @@ public:
}
switch
(
list
->
reload
(
origin
))
{
case
ConfigurableClientList
::
ZONE_
RELOADED
:
case
ConfigurableClientList
::
ZONE_
SUCCESS
:
// Everything worked fine.
LOG_DEBUG
(
auth_logger
,
DBG_AUTH_OPS
,
AUTH_LOAD_ZONE
)
.
arg
(
zone_class
).
arg
(
origin
);
...
...
src/lib/datasrc/client_list.cc
View file @
414a83fe
...
...
@@ -435,7 +435,7 @@ ConfigurableClientList::getCachedZoneWriter(const Name& name) {
load_action
=
boost
::
bind
(
loadZoneDataFromFile
,
_1
,
rrclass_
,
name
,
filename
);
}
return
(
ZoneWriterPair
(
ZONE_
RELOADED
,
return
(
ZoneWriterPair
(
ZONE_
SUCCESS
,
ZoneWriterPtr
(
result
.
info
->
cache_
->
getZoneTableSegment
().
getZoneWriter
(
load_action
,
name
,
rrclass_
))));
...
...
src/lib/datasrc/client_list.h
View file @
414a83fe
...
...
@@ -273,7 +273,8 @@ public:
CACHE_DISABLED
,
///< The cache is not enabled in this list.
ZONE_NOT_CACHED
,
///< Zone is served directly, not from cache.
ZONE_NOT_FOUND
,
///< Zone does not exist or not cached.
ZONE_RELOADED
///< The zone was successfully reloaded.
ZONE_SUCCESS
///< The zone was successfully reloaded or
/// the writer provided.
};
/// \brief Reloads a cached zone.
...
...
@@ -309,7 +310,7 @@ public:
/// \param zone The origin of the zone to reload.
/// \return The result has two parts. The first one is a status describing
/// if it worked or not (and in case it didn't, also why). If the
/// status is ZONE_
RELOADED
, the second part contains a shared pointer
/// status is ZONE_
SUCCESS
, the second part contains a shared pointer
/// to the writer. If the status is anything else, the second part is
/// NULL.
/// \throw DataSourceError or anything else that the data source
...
...
src/lib/datasrc/tests/client_list_unittest.cc
View file @
414a83fe
...
...
@@ -870,7 +870,7 @@ ConfigurableClientList::ReloadResult
ReloadTest
<
WriterUpdateType
>::
doReload
(
const
Name
&
origin
)
{
ConfigurableClientList
::
ZoneWriterPair
result
(
list_
->
getCachedZoneWriter
(
origin
));
if
(
result
.
first
==
ConfigurableClientList
::
ZONE_
RELOADED
)
{
if
(
result
.
first
==
ConfigurableClientList
::
ZONE_
SUCCESS
)
{
// Can't use ASSERT_NE here, it would wan't to return(), which
// it can't in non-void function.
if
(
result
.
second
)
{
...
...
@@ -878,7 +878,7 @@ ReloadTest<WriterUpdateType>::doReload(const Name& origin) {
result
.
second
->
install
();
result
.
second
->
cleanup
();
}
else
{
ADD_FAILURE
()
<<
"getCachedZoneWriter returned ZONE_
RELOADED
, "
ADD_FAILURE
()
<<
"getCachedZoneWriter returned ZONE_
SUCCESS
, "
"but the writer is NULL"
;
}
}
else
{
...
...
@@ -902,7 +902,7 @@ TYPED_TEST(ReloadTest, reloadSuccess) {
EXPECT_EQ
(
ZoneFinder
::
NXRRSET
,
this
->
list_
->
find
(
name
).
finder_
->
find
(
name
,
RRType
::
NS
())
->
code
);
// Now reload the full zone. It should be there now.
EXPECT_EQ
(
ConfigurableClientList
::
ZONE_
RELOADED
,
this
->
doReload
(
name
));
EXPECT_EQ
(
ConfigurableClientList
::
ZONE_
SUCCESS
,
this
->
doReload
(
name
));
EXPECT_EQ
(
ZoneFinder
::
SUCCESS
,
this
->
list_
->
find
(
name
).
finder_
->
find
(
name
,
RRType
::
NS
())
->
code
);
}
...
...
@@ -1035,7 +1035,7 @@ TYPED_TEST(ReloadTest, reloadMasterFile) {
f
<<
"nosuchdomain.
\t\t
3600
\t
IN
\t
TXT
\t
test"
<<
std
::
endl
;
f
.
close
();
// Do the reload.
EXPECT_EQ
(
ConfigurableClientList
::
ZONE_
RELOADED
,
this
->
doReload
(
Name
(
"."
)));
EXPECT_EQ
(
ConfigurableClientList
::
ZONE_
SUCCESS
,
this
->
doReload
(
Name
(
"."
)));
// It is here now.
EXPECT_EQ
(
ZoneFinder
::
SUCCESS
,
this
->
list_
->
find
(
Name
(
"."
)).
finder_
->
find
(
Name
(
"nosuchdomain"
),
...
...
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