hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2556 Rename configure -> post_configure

Browse Source 
Rename config::Configuration::configure() to
config::Configuration::post_configure(). Latter name makes it
unambiguously clear at what point the function is called.
This commit is contained in:
Johan Wikman
2019-06-10 18:50:51 +03:00
parent a6b456dfbd
commit 68af4cb62e
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/maxscale/config2.hh
View File

@ -844,11 +844,13 @@ public:
* Configuration to check any interdependencies between values or to calculate * Configuration to check any interdependencies between values or to calculate
* derived ones. * derived ones.
* *
* @param params The parameters the configuration was configured with.
*
* @return True, if everything is ok. * @return True, if everything is ok.
* *
* @note The default implementation returns true. * @note The default implementation returns true.
*/ */
virtual bool configure(); virtual bool post_configure(const MXS_CONFIG_PARAMETER& params);
/** /**
* @return The number of values in the configuration. * @return The number of values in the configuration.

4
server/core/config2.cc
View File

@ -246,7 +246,7 @@ bool Specification::configure(Configuration& configuration, const MXS_CONFIG_PAR
if (configured) if (configured)
{ {
configured = configuration.configure(); configured = configuration.post_configure(params);
} }
return configured; return configured;
@ -433,7 +433,7 @@ void Configuration::remove(Type* pValue)
m_values.erase(it); m_values.erase(it);
} }
bool Configuration::configure() bool Configuration::post_configure(const MXS_CONFIG_PARAMETER& params)
{ {
return true; return true;
} }

2
server/modules/filter/cache/cacheconfig.cc vendored
View File

@ -176,7 +176,7 @@ CacheConfig::~CacheConfig()
MXS_FREE(this->zStorage_options); MXS_FREE(this->zStorage_options);
} }
bool CacheConfig::configure() bool CacheConfig::post_configure(const MXS_CONFIG_PARAMETER&)
{ {
bool configured = true; bool configured = true;

2
server/modules/filter/cache/cacheconfig.hh vendored
View File

@ -70,7 +70,7 @@ public:
} }
private: private:
bool configure() override; bool post_configure(const MXS_CONFIG_PARAMETER& params) override;
private: private:
static config::Specification s_specification; static config::Specification s_specification;