improved rpm package build

replaced std::cout with Logger class

CMakeLists.txt

@@ -1,16 +1,17 @@
 cmake_minimum_required(VERSION 3.13)
-project(iprefresher VERSION 1.2.0 DESCRIPTION "Dynu ip refresher")
+project(iprefresher DESCRIPTION "Dynu ip refresher")
 
 set(CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_BUILD_TYPE Release) # manually set build type (Release / Debug)
-set(libmethod STATIC) #SHARED / STATIC
+set(LIB_METHOD STATIC) #SHARED / STATIC
 set(WinBuild false)
+set(PROJECT_VERSION 1.2.2)
+option(BUILD_DOC "Build documentation" ON)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
 #set up toolchain
 
 if (${WinBuild})
@@ -27,40 +28,46 @@ if (${WinBuild})
     set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
 
     # target environment on the build host system
-    set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw /usr/lib/gcc/${TOOLCHAIN_PREFIX}/8.3.0)
+    set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} /usr/lib/gcc/${TOOLCHAIN_PREFIX}/9.2.1)
 
 
     # modify default behavior of FIND_XXX() commands to
     # search for headers/libs in the target environment and
     # search for programs in the build host environment
-    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
     set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
     set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
     #    set(CMAKE_CXX_STANDARD_LIBRARIES -lcurl -lpthread -static-libgcc -static-libstdc++ -lcrypto -lssl -lws2_32 -std=c++11 -static -DCURL_STATICLIB)
-    set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc -static-libstdc++  -lcurl -lpthread -lstdc++ -lwsock32 -lws2_32 ${CMAKE_CSS_STANDARD_LIBRARIES}")
+#    set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc -static-libstdc++  -DCURL_STATICLIB -lstdc++ -lwsock32 -lws2_32 ${CMAKE_CSS_STANDARD_LIBRARIES}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -DCURL_STATICLIB -static -lpthread")
     #    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
     #    set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
-    add_definitions(-DCURL_STATICLIB)
+    #add_definitions(-DCURL_STATICLIB)
 else ()
     set(LIBSUFFIX .so)
     set(SUFFIX "")
 endif ()
 
-
+#config libs
+message(STATUS "Config of Libraries")
 find_package(CURL REQUIRED)
 if (CURL_FOUND)
     message(STATUS "Found CURL version: ${CURL_VERSION_STRING}")
     message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}")
     message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
-    #        include_directories(${CURL_INCLUDE_DIRS})
 else ()
-    message(FATAL_ERROR "Could not find CURLLL")
+    message(FATAL_ERROR "Could not find CURL")
 endif ()
+message("")
 include_directories(${CURL_INCLUDE_DIR} inc)
 
-add_library(api ${libmethod}
+#add version header
+FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h
+        "\#pragma once\nclass Version {\npublic:\n  static const std::string VERSION;\n};\n\n std::string const Version::VERSION = \"${PROJECT_VERSION}\";"
+        )
+
+add_library(api ${LIB_METHOD}
         src/api/API.cpp
 
         src/api/TelegramAPI.cpp
@@ -70,14 +77,16 @@ add_library(api ${libmethod}
         src/api/IPAPI.cpp
         )
 
-add_library(logger ${libmethod}
+add_library(logger ${LIB_METHOD}
+        src/FileLogger.cpp
         src/Logger.cpp
         )
 
 
 set(SOURCE
         src/main.cpp
-        src/IPRefresher.cpp inc/IPRefresher.h)
+        src/IPRefresher.cpp
+        )
 
 add_executable(iprefresher ${SOURCE})
 
@@ -90,6 +99,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/iprefresher.service DESTINATION /lib/s
 
 
 IF (UNIX)
+    message(STATUS "config of Package build")
     SET(CPACK_DEB_COMPONENT_INSTALL 1)
     SET(CPACK_OUTPUT_FILE_PREFIX packages)
 
@@ -102,7 +112,7 @@ IF (UNIX)
     if (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
         message(STATUS "found rpm build executeable --> able to build rpm")
         set(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
-        set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/lib/systemd/system" "/usr/lib/systemd") # --> needed to not override existing folders
+        set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd/system" "/lib/systemd" "/lib") # --> needed to not override existing folders
     else (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
         message(STATUS "not found rpm build tools --> not building rpm")
     endif (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
@@ -124,8 +134,9 @@ IF (UNIX)
     SET(CPACK_PACKAGE_VENDOR "Lukas Heilgienbrunner")
     SET(CPACK_PACKAGE_VERSION_MAJOR "1")
     SET(CPACK_PACKAGE_VERSION_MINOR "2")
-    SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+    set(CPACK_PACKAGE_VERSION_PATCH "1")
-    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
+    SET(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}")
     SET(CPACK_PACKAGE_CONTACT "Lukas Heiligenbrunner <ultimategameingcookie@gmail.com>")
     SET(CPACK_PACKAGE_SECTION "games")
     set(CPACK_PACKAGE_DEPENDS "libcurl (>= 7.0.0-1)")
@@ -136,5 +147,32 @@ IF (UNIX)
             "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target package
             DEPENDS ${PROJECT_NAME}
             COMMENT "Installing ${PROJECT_NAME}")
-
+message("")
 ENDIF (UNIX)
+
+# check if Doxygen is installed
+
+if (BUILD_DOC)
+    message(STATUS "config of DOxygen build")
+    find_package(Doxygen)
+    if (DOXYGEN_FOUND)
+        # set input and output files
+        set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in)
+        set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+
+        # request to configure the file
+        configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
+
+        # note the option ALL which allows to build the docs together with the application
+        add_custom_target(doc_doxygen ALL
+                COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                COMMENT "Generating API documentation with Doxygen"
+                VERBATIM)
+        message(STATUS "Successfully configured doxygen")
+
+    else (DOXYGEN_FOUND)
+        message(STATUS "Doxygen need to be installed to generate the doxygen documentation")
+    endif (DOXYGEN_FOUND)
+    message("")
+endif (BUILD_DOC)

docs/Doxyfile.in

@@ -0,0 +1,383 @@
+#OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/doc_doxygen/
+#INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/inc/ @CMAKE_CURRENT_SOURCE_DIR@/../docs
+
+
+# Doxyfile 1.8.15
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = "My Project"
+PROJECT_NUMBER         =
+PROJECT_BRIEF          =
+PROJECT_LOGO           =
+OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/doc_doxygen/
+CREATE_SUBDIRS         = NO
+ALLOW_UNICODE_NAMES    = NO
+OUTPUT_LANGUAGE        = English
+OUTPUT_TEXT_DIRECTION  = None
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = NO
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 4
+ALIASES                =
+TCL_SUBST              =
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
+EXTENSION_MAPPING      =
+MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 0
+AUTOLINK_SUPPORT       = YES
+BUILTIN_STL_SUPPORT    = NO
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = NO
+SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
+TYPEDEF_HIDES_STRUCT   = NO
+LOOKUP_CACHE_SIZE      = 0
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_PACKAGE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = NO
+HIDE_SCOPE_NAMES       = NO
+HIDE_COMPOUND_REFERENCE= NO
+SHOW_INCLUDE_FILES     = YES
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = NO
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_AS_ERROR          = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           =
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/inc/
+INPUT_ENCODING         = UTF-8
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f \
+                         *.for \
+                         *.tcl \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.ice
+RECURSIVE              = YES
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       = *
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION    = NO
+REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          =
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE_HUE    = 126
+HTML_COLORSTYLE_SAT    = 0
+HTML_COLORSTYLE_GAMMA  = 240
+HTML_TIMESTAMP         = NO
+HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_SECTIONS  = NO
+HTML_INDEX_NUM_ENTRIES = 100
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
+DISABLE_INDEX          = NO
+GENERATE_TREEVIEW      = YES
+ENUM_VALUES_PER_LINE   = 4
+TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+FORMULA_FONTSIZE       = 10
+FORMULA_TRANSPARENT    = YES
+USE_MATHJAX            = NO
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = YES
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = YES
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         =
+MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = \makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
+LATEX_BIB_STYLE        = plain
+LATEX_TIMESTAMP        = NO
+LATEX_EMOJI_DIRECTORY  =
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+RTF_SOURCE_CODE        = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_SUBDIR             =
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+DOCBOOK_PROGRAMLISTING = NO
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+TAGFILES               =
+GENERATE_TAGFILE       =
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+MSCGEN_PATH            =
+DIA_PATH               =
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+DOT_NUM_THREADS        = 0
+DOT_FONTNAME           = Helvetica
+DOT_FONTSIZE           = 10
+DOT_FONTPATH           =
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+UML_LIMIT_NUM_FIELDS   = 10
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+INTERACTIVE_SVG        = NO
+DOT_PATH               =
+DOTFILE_DIRS           =
+MSCFILE_DIRS           =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_CFG_FILE      =
+PLANTUML_INCLUDE_PATH  =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES

inc/FileLogger.h

@@ -0,0 +1,27 @@
+//
+// Created by lukas on 05.05.19.
+//
+#pragma once
+
+#include <string>
+class FileLogger {
+public:
+    /**
+     * log messages to logfile
+     * @param text message
+     */
+    void logToLogfile(std::string text);
+
+    /**
+     * safe ip to temp file
+     * @param ip ip address to save
+     */
+    void safeip(std::string ip);
+
+    /**
+     * read ip from file
+     * @return read ip
+     */
+    std::string readip();
+
+};

inc/IPRefresher.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-
 class IPRefresher {
 public:
     /**
@@ -13,5 +12,5 @@ public:
     void checkIPAdress(bool force);
 
     IPRefresher();
-    IPRefresher(bool loop);
+    explicit IPRefresher(bool loop);
 };

inc/Logger.h

@@ -1,27 +1,22 @@
 //
-// Created by lukas on 05.05.19.
+// Created by lukas on 26.10.19.
 //
+
 #pragma once
 
 #include <string>
+
 class Logger {
 public:
-    /**
+    static void debug(std::string message);
-     * log messages to logfile
+    static void message(std::string message);
-     * @param text message
+    static void warning(std::string message);
-     */
+    static void error(std::string message);
-    void logToLogfile(std::string text);
 
-    /**
+    static void log(std::string &message, int level);
-     * safe ip to temp file
-     * @param ip ip address to save
-     */
-    void safeip(std::string ip);
-
-    /**
-     * read ip from file
-     * @return read ip
-     */
-    std::string readip();
 
+    static const int Debug;
+    static const int Message;
+    static const int Warning;
+    static const int Error;
 };

src/FileLogger.cpp

@@ -0,0 +1,49 @@
+//
+// Created by lukas on 05.05.19.
+//
+
+#include <fstream>
+#include <ctime>
+#include <iostream>
+#include <sstream>
+
+#include "FileLogger.h"
+
+void FileLogger::safeip(std::string ip) {
+    std::ofstream out;
+    out.open("ip.txt", std::ios::out);
+
+    out << ip;
+
+    out.close();
+}
+
+std::string FileLogger::readip() {
+    std::ifstream in;
+    in.open("ip.txt", std::ios::in);
+
+    std::string ip;
+
+    in >> ip;
+
+    return ip;
+}
+
+void FileLogger::logToLogfile(std::string text) {
+    std::ofstream out;
+    out.open("dynurefresher.log", std::ios::out | std::ios::app);
+
+
+    std::time_t t = std::time(0);   // get time now
+    std::tm *now = std::localtime(&t);
+
+    std::stringstream logline;
+
+    logline << "[ " << (now->tm_year + 1900) << '-' << (now->tm_mon + 1) << '-' << now->tm_mday
+            << "_" << now->tm_hour << ":" << now->tm_min << ":" << now->tm_sec << " ] " << '\t' << text << std::endl;
+
+
+    out << logline.str();
+
+    out.close();
+}

src/IPRefresher.cpp

@@ -4,18 +4,19 @@
 
 #include <string>
 
-#include <Logger.h>
+#include <FileLogger.h>
 #include <api/IPAPI.h>
 #include <api/DynuAPI.h>
 #include <api/TelegramAPI.h>
 
 #include <chrono>
 #include <thread>
+#include <Logger.h>
 
-#include "IPRefresher.h"
+#include <IPRefresher.h>
 
 void IPRefresher::checkIPAdress(bool force) {
-    Logger logger;
+    FileLogger logger;
 
     IPAPI ipapi;
     std::string ip = ipapi.getGlobalIp();
@@ -23,16 +24,16 @@ void IPRefresher::checkIPAdress(bool force) {
     if (ip.empty()) {
         //no internet connection
         logger.logToLogfile("[WARNING] no internet connection");
-        std::cout << "[WARNING] no internet connection" << std::endl;
+        Logger::warning("no internet connection");
     } else {
         std::string oldip = logger.readip();
 
         if (oldip == ip && !force) {
-            std::cout << "[INFO] no change -- ip: " << ip << std::endl;
+            Logger::message("no change -- ip: " + ip);
             logger.logToLogfile(" [INFO] no change -- ip: " + ip);
         } else {
             logger.logToLogfile(" [INFO] ip changed! -- from :" + oldip + "to: " + ip);
-            std::cout << "[INFO] ip changed! -- from :" << oldip << "to: " << ip << std::endl;
+            Logger::message("ip changed! -- from :" + oldip + "to: " + ip);
 
             DynuAPI dynu;
 
@@ -43,6 +44,7 @@ void IPRefresher::checkIPAdress(bool force) {
             } else {
                 //error
                 logger.logToLogfile(" [ERROR] failed to write ip to dynu api!");
+                Logger::error("failed to write ip to dynu api!");
             }
 
             logger.safeip(ip);
@@ -55,8 +57,10 @@ IPRefresher::IPRefresher() {
 }
 
 IPRefresher::IPRefresher(bool loop) {
-    while(true){
+    Logger::message("startup of service");
-        std::this_thread::sleep_for(std::chrono::milliseconds(300000));
+    while (loop) {
+        Logger::message("starting check");
         checkIPAdress(false);
+        std::this_thread::sleep_for(std::chrono::milliseconds(300000));
     }
 }

src/Logger.cpp

@@ -1,49 +1,53 @@
 //
-// Created by lukas on 05.05.19.
+// Created by lukas on 26.10.19.
 //
 
-#include <fstream>
-#include <ctime>
-#include <iostream>
 #include <sstream>
+#include <iostream>
 
 #include "Logger.h"
 
-void Logger::safeip(std::string ip) {
-    std::ofstream out;
-    out.open("ip.txt", std::ios::out);
 
-    out << ip;
+const int Logger::Warning = 1;
+const int Logger::Debug = 2;
+const int Logger::Message = 3;
+const int Logger::Error = 4;
 
-    out.close();
+void Logger::debug(std::string message) {
+    log(message, Logger::Debug);
 }
 
-std::string Logger::readip() {
+void Logger::message(std::string message) {
-    std::ifstream in;
+    log(message, Logger::Message);
-    in.open("ip.txt", std::ios::in);
-
-    std::string ip;
-
-    in >> ip;
-
-    return ip;
 }
 
-void Logger::logToLogfile(std::string text) {
+void Logger::warning(std::string message) {
-    std::ofstream out;
+    log(message, Logger::Warning);
-    out.open("dynurefresher.log", std::ios::out | std::ios::app);
-
-
-    std::time_t t = std::time(0);   // get time now
-    std::tm *now = std::localtime(&t);
-
-    std::stringstream logline;
-
-    logline << "[ " << (now->tm_year + 1900) << '-' << (now->tm_mon + 1) << '-' << now->tm_mday
-            << "_" << now->tm_hour << ":" << now->tm_min << ":" << now->tm_sec << " ] " << '\t' << text << std::endl;
-
-
-    out << logline.str();
-
-    out.close();
 }
+
+void Logger::error(std::string message) {
+    log(message, Logger::Error);
+}
+
+void Logger::log(std::string &message, int level) {
+    std::stringstream out;
+    out << "[";
+    switch (level) {
+        case Debug:
+            out << "DEBUG";
+            break;
+        case Message:
+            out << "MESSAGE";
+            break;
+        case Warning:
+            out << "WARNING";
+            break;
+        case Error:
+            out << "ERROR";
+            break;
+    }
+    out << "] ";
+    out << message;
+    std::cout << out.str() << std::endl;
+}
+

src/main.cpp

@@ -1,8 +1,9 @@
 #include <iostream>
 #include <IPRefresher.h>
+#include <Version.h>
+#include <Logger.h>
 
 int main(int argc, char *argv[]) {
-
     if (argc > 1) {
         std::string firstarg(argv[1]);
         if (firstarg == "-h" || firstarg == "--help") {
@@ -12,18 +13,18 @@ int main(int argc, char *argv[]) {
                       << "[-l] [--loop] infinite loop to refresh ip every five minutes" << std::endl
                       << "[no argument] normal ip check and refresh" << std::endl;
         } else if (firstarg == "-v" || firstarg == "--version") {
-            std::cout << "Version 1.2" << std::endl;
+            std::cout << "Version " << Version::VERSION << std::endl;
         } else if (firstarg == "-f" || firstarg == "--force") {
             IPRefresher ipr;
             ipr.checkIPAdress(true);
         } else if (firstarg == "-l" || firstarg == "--loop") {
             IPRefresher ipr(true);
-            ipr.checkIPAdress(false);
         } else {
-            std::cout << "wrong arguments!  -h for help" << std::endl;
+            Logger::message("wrong arguments!  -h for help");
         }
     } else {
         IPRefresher ipr;
+        Logger::message("starting check");
         ipr.checkIPAdress(false);
 
     }