summaryrefslogtreecommitdiff
path: root/src/checker
diff options
context:
space:
mode:
Diffstat (limited to 'src/checker')
-rw-r--r--src/checker/errors/mail/empty.cpp7
-rw-r--r--src/checker/errors/settings/port_number.cpp2
-rw-r--r--src/checker/errors/settings/port_number.hpp2
-rw-r--r--src/checker/errors/settings/server.cpp2
-rw-r--r--src/checker/errors/settings/server.hpp2
-rw-r--r--src/checker/errors/types/isettings_error.hpp4
6 files changed, 7 insertions, 12 deletions
diff --git a/src/checker/errors/mail/empty.cpp b/src/checker/errors/mail/empty.cpp
index 8a1591e..c39516e 100644
--- a/src/checker/errors/mail/empty.cpp
+++ b/src/checker/errors/mail/empty.cpp
@@ -5,11 +5,6 @@ namespace smtp::checker::errors::mail
{
bool Empty::Check( std::string const& line ) const
{
- auto result = !line.empty() && line != " ";
- if( !result )
- {
- logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Mails are empty" );
- }
- return result;
+ return !line.empty() && line != " ";
}
}
diff --git a/src/checker/errors/settings/port_number.cpp b/src/checker/errors/settings/port_number.cpp
index b0d9661..6e8b960 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( manage::SettingsFileDataType const& line ) const
+ bool PortNumber::Check( general::SettingsFileDataType const& line ) const
{
static const std::string PORT_FIELD = "port";
static constexpr int MIN_PORT_NUMBER = 0;
diff --git a/src/checker/errors/settings/port_number.hpp b/src/checker/errors/settings/port_number.hpp
index 789a486..a3145e9 100644
--- a/src/checker/errors/settings/port_number.hpp
+++ b/src/checker/errors/settings/port_number.hpp
@@ -10,7 +10,7 @@ namespace smtp::checker::errors::settings
PortNumber() = default;
~PortNumber() override = default;
- bool Check( manage::SettingsFileDataType const& line ) const override;
+ bool Check( general::SettingsFileDataType const& line ) const override;
};
}
diff --git a/src/checker/errors/settings/server.cpp b/src/checker/errors/settings/server.cpp
index d25bc9a..ecddf9a 100644
--- a/src/checker/errors/settings/server.cpp
+++ b/src/checker/errors/settings/server.cpp
@@ -8,7 +8,7 @@ namespace smtp::checker::errors::settings
//
//Public methods
//
- bool Server::Check( manage::SettingsFileDataType const& line ) const
+ bool Server::Check( general::SettingsFileDataType const& line ) const
{
static const std::string SERVER_FIELD = "host";
diff --git a/src/checker/errors/settings/server.hpp b/src/checker/errors/settings/server.hpp
index 53e6170..31a7758 100644
--- a/src/checker/errors/settings/server.hpp
+++ b/src/checker/errors/settings/server.hpp
@@ -10,7 +10,7 @@ namespace smtp::checker::errors::settings
Server() = default;
~Server() override = default;
- bool Check( manage::SettingsFileDataType const& line ) const override;
+ bool Check( general::SettingsFileDataType const& line ) const override;
private:
bool IsNormalName( std::string const& line ) const;
bool IsIpName( std::string const& line ) const;
diff --git a/src/checker/errors/types/isettings_error.hpp b/src/checker/errors/types/isettings_error.hpp
index 6355d79..8c9d25a 100644
--- a/src/checker/errors/types/isettings_error.hpp
+++ b/src/checker/errors/types/isettings_error.hpp
@@ -6,7 +6,7 @@
#include <memory>
-#include "management/general.hpp"
+#include "general/struct.hpp"
namespace smtp::checker::errors::types
{
@@ -21,7 +21,7 @@ namespace smtp::checker::errors::types
static const std::string METHOD_NAME = "Check settings";
return METHOD_NAME;
}
- virtual bool Check( manage::SettingsFileDataType const& line ) const = 0;
+ virtual bool Check( general::SettingsFileDataType const& line ) const = 0;
};
using IErrorSettingsPtr = std::shared_ptr<IErrorSettings>;
}