diff options
author | eportnov <eportnov@ibs.ru> | 2022-10-03 11:37:47 +0300 |
---|---|---|
committer | eportnov <eportnov@ibs.ru> | 2022-10-03 11:37:47 +0300 |
commit | e41b247e61ce4d4cc96badab3a14bf413e4f46f2 (patch) | |
tree | f68d57d9b472cbe1186f235034b97a1be75cac08 /src/checker/errors/settings | |
parent | 7e2843c706c1a6e033662c45957a76e01d167438 (diff) | |
download | obmc-sila-smtp-e41b247e61ce4d4cc96badab3a14bf413e4f46f2.tar.xz |
refactoring
Diffstat (limited to 'src/checker/errors/settings')
-rw-r--r-- | src/checker/errors/settings/port_number.cpp | 10 | ||||
-rw-r--r-- | src/checker/errors/settings/server.cpp | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/checker/errors/settings/port_number.cpp b/src/checker/errors/settings/port_number.cpp index 485b4c7..b0d9661 100644 --- a/src/checker/errors/settings/port_number.cpp +++ b/src/checker/errors/settings/port_number.cpp @@ -5,7 +5,7 @@ namespace smtp::checker::errors::settings { - bool PortNumber::Check( const manage::SettingsFileDataType& line ) const + bool PortNumber::Check( manage::SettingsFileDataType const& line ) const { static const std::string PORT_FIELD = "port"; static constexpr int MIN_PORT_NUMBER = 0; @@ -23,6 +23,7 @@ namespace smtp::checker::errors::settings { return true; } + int host_as_int{}; try { @@ -43,6 +44,11 @@ namespace smtp::checker::errors::settings logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Port doesn't entered by numbers" ); return false; } - return host_as_int >= MIN_PORT_NUMBER && host_as_int <= MAX_PORT_NUMBER; + auto result = host_as_int >= MIN_PORT_NUMBER && host_as_int <= MAX_PORT_NUMBER; + if( !result ) + { + logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Port doesn't entered by numbers" ); + } + return result; } } diff --git a/src/checker/errors/settings/server.cpp b/src/checker/errors/settings/server.cpp index c3f29af..d25bc9a 100644 --- a/src/checker/errors/settings/server.cpp +++ b/src/checker/errors/settings/server.cpp @@ -18,7 +18,12 @@ namespace smtp::checker::errors::settings logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Host doesn't found" ); return false; } - return IsNormalName( find->second ) || IsIpName( find->second ); + auto result = IsNormalName( find->second ) || IsIpName( find->second ); + if( !result ) + { + logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Host set incorrectly" ); + } + return result; } // |