fixed incorrect merge of branches
This commit is contained in:
		@@ -11,8 +11,6 @@
 | 
				
			|||||||
#include <thread>
 | 
					#include <thread>
 | 
				
			||||||
#include <Logger.h>
 | 
					#include <Logger.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace IPRefresher;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
bool IPRefresher::checkIPAdress(bool force) {
 | 
					bool IPRefresher::checkIPAdress(bool force) {
 | 
				
			||||||
    FileLogger logger;
 | 
					    FileLogger logger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -60,7 +58,7 @@ bool IPRefresher::checkIPAdress(bool force) {
 | 
				
			|||||||
void IPRefresher::startUpService(int interval) {
 | 
					void IPRefresher::startUpService(int interval) {
 | 
				
			||||||
    Logger::message("startup of service");
 | 
					    Logger::message("startup of service");
 | 
				
			||||||
    Logger::message("Version: " + StaticData::VERSION);
 | 
					    Logger::message("Version: " + StaticData::VERSION);
 | 
				
			||||||
    if (Config::readConfig()) {
 | 
					
 | 
				
			||||||
    while (true) {
 | 
					    while (true) {
 | 
				
			||||||
        Logger::message("starting check");
 | 
					        Logger::message("starting check");
 | 
				
			||||||
        if (Config::readConfig()) {
 | 
					        if (Config::readConfig()) {
 | 
				
			||||||
@@ -70,7 +68,4 @@ void IPRefresher::startUpService(int interval) {
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
        std::this_thread::sleep_for(std::chrono::milliseconds(interval * 1000));
 | 
					        std::this_thread::sleep_for(std::chrono::milliseconds(interval * 1000));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    } else {
 | 
					 | 
				
			||||||
        std::cout << "incorrect credentials!" << std::endl;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user