Commit 0958095d authored by Stephen Morris's avatar Stephen Morris
Browse files

[trac1024] Rename function resetting root logger characteristics

Shortened the name to resetUnitTestRootLogger() to make it a bit less
of a mouthful.
parent 8e66cc33
...@@ -80,7 +80,7 @@ b10LoggerDbglevel(int defdbglevel) { ...@@ -80,7 +80,7 @@ b10LoggerDbglevel(int defdbglevel) {
// variables B10_LOGGER_SEVERITY, B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION. // variables B10_LOGGER_SEVERITY, B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION.
void void
setUnitTestRootLoggerCharacteristics() { resetUnitTestRootLogger() {
using namespace isc::log; using namespace isc::log;
...@@ -168,7 +168,7 @@ void initLogger(isc::log::Severity severity, int dbglevel) { ...@@ -168,7 +168,7 @@ void initLogger(isc::log::Severity severity, int dbglevel) {
// in the environment variables. (The two-step approach is used as the // in the environment variables. (The two-step approach is used as the
// setUnitTestRootLoggerCharacteristics() function is used in several // setUnitTestRootLoggerCharacteristics() function is used in several
// places in the BIND 10 tests, and it avoid duplicating code.) // places in the BIND 10 tests, and it avoid duplicating code.)
setUnitTestRootLoggerCharacteristics(); resetUnitTestRootLogger();
} }
} // namespace log } // namespace log
......
...@@ -103,15 +103,15 @@ isc::log::Severity b10LoggerSeverity(isc::log::Severity defseverity); ...@@ -103,15 +103,15 @@ isc::log::Severity b10LoggerSeverity(isc::log::Severity defseverity);
int b10LoggerDbglevel(int defdbglevel); int b10LoggerDbglevel(int defdbglevel);
/// \brief Reset Logger Characteristics /// \brief Reset Root Logger Characteristics
/// ///
/// This is a simplified interface into the setting of the characteristics /// This is a simplified interface into the resetting of the characteristics
/// of the root logger. It is aimed for use in unit tests and resets the /// of the root logger. It is aimed for use in unit tests and resets the
/// characteristics of the root logger to use a severity, debug level and /// characteristics of the root logger to use a severity, debug level and
/// destination set by the environment variables B10_LOGGER_SEVERITY, /// destination set by the environment variables B10_LOGGER_SEVERITY,
/// B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION. /// B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION.
void void
setUnitTestRootLoggerCharacteristics(); resetUnitTestRootLogger();
} // namespace log } // namespace log
} // namespace isc } // namespace isc
......
...@@ -30,7 +30,7 @@ class LoggerLevelImplTest : public ::testing::Test { ...@@ -30,7 +30,7 @@ class LoggerLevelImplTest : public ::testing::Test {
protected: protected:
LoggerLevelImplTest() { LoggerLevelImplTest() {
// Ensure logging set to default for unit tests // Ensure logging set to default for unit tests
setUnitTestRootLoggerCharacteristics(); resetUnitTestRootLogger();
} }
~LoggerLevelImplTest() ~LoggerLevelImplTest()
......
...@@ -31,7 +31,7 @@ protected: ...@@ -31,7 +31,7 @@ protected:
LoggerLevelTest() { LoggerLevelTest() {
// Logger initialization is done in main(). As logging tests may // Logger initialization is done in main(). As logging tests may
// alter the default logging output, it is reset here. // alter the default logging output, it is reset here.
setUnitTestRootLoggerCharacteristics(); resetUnitTestRootLogger();
} }
~LoggerLevelTest() { ~LoggerLevelTest() {
LoggerManager::reset(); LoggerManager::reset();
......
...@@ -23,7 +23,7 @@ protected: ...@@ -23,7 +23,7 @@ protected:
LoggerSupportTest() { LoggerSupportTest() {
// Logger initialization is done in main(). As logging tests may // Logger initialization is done in main(). As logging tests may
// alter the default logging output, it is reset here. // alter the default logging output, it is reset here.
setUnitTestRootLoggerCharacteristics(); resetUnitTestRootLogger();
} }
~LoggerSupportTest() { ~LoggerSupportTest() {
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment