Merge branch 'master' into feature/logger

# Conflicts:
#	CMakeLists.txt
#	src/file/mail.cpp
#	src/file/settings.cpp
#	src/management/logger.cpp
#	src/management/logger.hpp
#	src/message/sender.cpp
#	src/message/sender.hpp

1 files changed, 59 insertions, 48 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56bc523..9fe6741 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,53 +27,51 @@ option (
 )
 
 if(NOT ${YOCTO_DEPENDENCIES})
-  include(ExternalProject)
-
-  ExternalProject_Add(
-    Boost
-    URL "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2"
-    URL_MD5 "33334dd7f862e8ac9fe1cc7c6584fb6d"
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/src/boost
-    BINARY_DIR ${CMAKE_BINARY_DIR}/libs/boost
-    CONFIGURE_COMMAND cd <SOURCE_DIR> && ./bootstrap.sh
-    BUILD_COMMAND cd <SOURCE_DIR> && ./b2 --exec-prefix=<BINARY_DIR>
-                  --prefix=<BINARY_DIR> --with-system --with-coroutine install
-    INSTALL_COMMAND ""
-    UPDATE_COMMAND "")
-
-  set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/libs/boost/ ${CMAKE_PREFIX_PATH})
-  include_directories(SYSTEM ${CMAKE_BINARY_DIR}/libs/boost/include)
-  link_directories(SYSTEM ${CMAKE_BINARY_DIR}/libs/boost/lib)
-
-  ExternalProject_Add(
-    sdbusplus-project
-    PREFIX ${CMAKE_BINARY_DIR}/sdbusplus-project
-    GIT_REPOSITORY https://github.com/openbmc/sdbusplus.git
-    GIT_TAG afe80cf2e5dc4aefe3b041adeb0230e61929bf12
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/sdbusplus-src
-    BINARY_DIR ${CMAKE_BINARY_DIR}/sdbusplus-build
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/sdbusplus-src && ./bootstrap.sh &&
-                  ./configure --enable-transaction && make -j libsdbusplus.la
-    INSTALL_COMMAND ""
-    LOG_DOWNLOAD ON
-    UPDATE_COMMAND "")
-
-  include_directories(${CMAKE_BINARY_DIR}/sdbusplus-src)
-  link_directories(${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
-
-  # Boost related definitions
-  add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
-  add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
-  add_definitions(-DBOOST_SYSTEM_NO_DEPRECATED)
-  add_definitions(-DBOOST_ALL_NO_LIB)
-  add_definitions(-DBOOST_NO_RTTI)
-  add_definitions(-DBOOST_NO_TYPEID)
-  add_definitions(-DBOOST_ASIO_DISABLE_THREADS)
+    include(ExternalProject)
+
+    ExternalProject_Add(
+        Boost
+        URL "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2"
+        URL_MD5 "33334dd7f862e8ac9fe1cc7c6584fb6d"
+        SOURCE_DIR ${CMAKE_BINARY_DIR}/src/boost
+        BINARY_DIR ${CMAKE_BINARY_DIR}/libs/boost
+        CONFIGURE_COMMAND cd <SOURCE_DIR> && ./bootstrap.sh
+        BUILD_COMMAND cd <SOURCE_DIR> && ./b2 --exec-prefix=<BINARY_DIR>
+                      --prefix=<BINARY_DIR> --with-system --with-coroutine install
+        INSTALL_COMMAND ""
+        UPDATE_COMMAND ""
+    )
+
+    set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/libs/boost/ ${CMAKE_PREFIX_PATH})
+    include_directories(SYSTEM ${CMAKE_BINARY_DIR}/libs/boost/include)
+    link_directories(SYSTEM ${CMAKE_BINARY_DIR}/libs/boost/lib)
+
+    ExternalProject_Add(
+        sdbusplus-project
+        PREFIX ${CMAKE_BINARY_DIR}/sdbusplus-project
+        GIT_REPOSITORY https://github.com/openbmc/sdbusplus.git
+        GIT_TAG afe80cf2e5dc4aefe3b041adeb0230e61929bf12
+        SOURCE_DIR ${CMAKE_BINARY_DIR}/sdbusplus-src
+        BINARY_DIR ${CMAKE_BINARY_DIR}/sdbusplus-build
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/sdbusplus-src && ./bootstrap.sh &&
+                      ./configure --enable-transaction && make -j libsdbusplus.la
+        INSTALL_COMMAND ""
+        LOG_DOWNLOAD ON
+        UPDATE_COMMAND ""
+    )
+
+    include_directories(${CMAKE_BINARY_DIR}/sdbusplus-src)
+    link_directories(${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
+
+    add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
+    add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
+    add_definitions(-DBOOST_SYSTEM_NO_DEPRECATED)
+    add_definitions(-DBOOST_ALL_NO_LIB)
+    add_definitions(-DBOOST_NO_RTTI)
+    add_definitions(-DBOOST_NO_TYPEID)
+    add_definitions(-DBOOST_ASIO_DISABLE_THREADS)
 else()
-  # Include Boost library. This allows specify exact version of BOOST to be
-  # used, especially important while using valgrind, to point BOOST that is
-  # compiled with valgrind support
   if(${BOOST_VERSION})
     find_package(Boost ${BOOST_VERSION} EXACT)
   else()
@@ -93,12 +91,13 @@ include_directories(src)
 set(SRC_DIR src)
 set(MESSAGE_DIR src/message)
 set(SERVICE_DIR src/service)
-set(MANAGEMENT_DIR src/managment)
+set(MANAGEMENT_DIR src/management)
 set(FILE_DIR src/file)
 set(PARSER_DIR src/file/parser)
-set(MANAGER_BUILDER_DIR src/managment/builder)
+set(MANAGER_BUILDER_DIR src/management/builder)
 set(CONVERTER_DIR src/converter)
 set(LOGGER_DIR src/logger)
+set(CHECKER_DIR src/checker)
 
 set(SRC_FILES
     ${SRC_DIR}/main.cpp
@@ -157,6 +156,18 @@ set(SRC_FILES
     ${LOGGER_DIR}/journal.hpp
     ${LOGGER_DIR}/logger_set.cpp
     ${LOGGER_DIR}/logger_set.hpp
+
+    ${CHECKER_DIR}/registrator_mails.hpp
+    ${CHECKER_DIR}/registrator_mails.cpp
+    ${CHECKER_DIR}/registrator_settings.hpp
+
+    ${CHECKER_DIR}/errors/settings/port_number.cpp
+    ${CHECKER_DIR}/errors/settings/port_number.hpp
+    ${CHECKER_DIR}/errors/mail/empty.hpp
+    ${CHECKER_DIR}/errors/mail/empty.cpp
+
+    ${CHECKER_DIR}/errors/types/imails_error.hpp
+    ${CHECKER_DIR}/errors/types/isettings_error.hpp
 )
 
 if( ${ADD_PHOSPHOR_LOGGING} )