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
Sebastian Schrader
Kea
Commits
3b2c3ac0
Commit
3b2c3ac0
authored
Aug 29, 2014
by
Marcin Siodelski
Browse files
[3534] Removed CfgMgr::getConfiguration.
parent
2f7c21ec
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/json_config_parser.cc
View file @
3b2c3ac0
...
...
@@ -653,7 +653,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
}
LOG_INFO
(
dhcp4_logger
,
DHCP4_CONFIG_COMPLETE
)
.
arg
(
CfgMgr
::
instance
().
getC
onfiguration
()
->
.
arg
(
CfgMgr
::
instance
().
getC
urrent
()
->
getConfigSummary
(
Configuration
::
CFGSEL_ALL4
));
// Everything was fine. Configuration is successful.
...
...
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View file @
3b2c3ac0
...
...
@@ -144,7 +144,7 @@ ControlledDhcpv6Srv::processConfig(isc::data::ConstElementPtr config) {
// safe and we really don't want to emit exceptions to the callback caller.
// Instead, catch an exception and create appropriate answer.
try
{
CfgMgr
::
instance
().
getC
onfiguration
()
->
getCfgIface
()
CfgMgr
::
instance
().
getC
urrent
()
->
getCfgIface
()
.
openSockets
(
CfgIface
::
V6
,
srv
->
getPort
());
}
catch
(
const
std
::
exception
&
ex
)
{
...
...
src/bin/dhcp6/json_config_parser.cc
View file @
3b2c3ac0
...
...
@@ -854,7 +854,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
}
LOG_INFO
(
dhcp6_logger
,
DHCP6_CONFIG_COMPLETE
)
.
arg
(
CfgMgr
::
instance
().
getC
onfiguration
()
->
.
arg
(
CfgMgr
::
instance
().
getC
urrent
()
->
getConfigSummary
(
Configuration
::
CFGSEL_ALL6
));
// Everything was fine. Configuration is successful.
...
...
src/bin/dhcp6/kea_controller.cc
View file @
3b2c3ac0
...
...
@@ -74,7 +74,7 @@ void configure(const std::string& file_name) {
// If there's no logging element, we'll just pass NULL pointer,
// which will be handled by configureLogger().
Daemon
::
configureLogger
(
json
->
get
(
"Logging"
),
CfgMgr
::
instance
().
get
Configuration
(),
CfgMgr
::
instance
().
get
Staging
(),
ControlledDhcpv6Srv
::
getInstance
()
->
getVerbose
());
// Get Dhcp6 component from the config
...
...
src/lib/dhcpsrv/cfgmgr.cc
View file @
3b2c3ac0
...
...
@@ -387,11 +387,6 @@ CfgMgr::rollback() {
}
}
ConfigurationPtr
CfgMgr
::
getConfiguration
()
{
return
(
configuration_
);
}
ConstConfigurationPtr
CfgMgr
::
getCurrent
()
{
ensureCurrentAllocated
();
...
...
src/lib/dhcpsrv/cfgmgr.h
View file @
3b2c3ac0
...
...
@@ -415,11 +415,6 @@ public:
/// This function is exception safe.
void
rollback
();
/// @brief Returns the current configuration.
///
/// @return a pointer to the current configuration.
ConfigurationPtr
getConfiguration
();
/// @brief Returns a pointer to the current configuration.
///
/// This function returns pointer to the current configuration. If the
...
...
src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
View file @
3b2c3ac0
...
...
@@ -295,9 +295,12 @@ public:
// it is empty by default.
TEST_F
(
CfgMgrTest
,
configuration
)
{
ConfigurationPtr
configuration
=
CfgMgr
::
instance
().
getC
onfiguration
();
Const
ConfigurationPtr
configuration
=
CfgMgr
::
instance
().
getC
urrent
();
ASSERT_TRUE
(
configuration
);
EXPECT_TRUE
(
configuration
->
getLoggingInfo
().
empty
());
configuration
=
CfgMgr
::
instance
().
getStaging
();
ASSERT_TRUE
(
configuration
);
EXPECT_TRUE
(
configuration
->
getLoggingInfo
().
empty
());
}
...
...
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