autoformat all sources

This commit is contained in:
2024-04-24 22:31:09 +02:00
parent e4a73556d6
commit 70dda97ae2
16 changed files with 746 additions and 752 deletions

View File

@ -5,16 +5,15 @@
* @date 04.09.2020
*/
#include "../../include/reHDD.h" //for logger settings
#include "../../include/logger/logger.h"
using namespace std;
string version = "0.2.1"; //logger version
string version = "0.2.1"; // logger version
bool Logger::instanceFlag = false;
Logger* Logger::single = NULL;
Logger *Logger::single = NULL;
/**
* \brief create new logger instance
@ -95,13 +94,13 @@ void Logger::error(string s)
void Logger::writeLog(string s)
{
ofstream logFile;
Logger::mtxLog.lock(); //lock this section for other threads
Logger::mtxLog.lock(); // lock this section for other threads
logFile.open(this->logPath, ios_base::app);
logFile << (s + "\n"); //append to existing file
logFile << (s + "\n"); // append to existing file
logFile.close();
Logger::mtxLog.unlock(); //unlock this section for other threads
Logger::mtxLog.unlock(); // unlock this section for other threads
}
/**
@ -120,21 +119,21 @@ void Logger::newLine()
*/
string Logger::getTimestamp()
{
struct tm * timeinfo;
struct tm *timeinfo;
struct timeval tv;
int millisec;
char cpDate [80];
char buffer [120];
char cpDate[80];
char buffer[120];
gettimeofday(&tv, NULL);
millisec = lrint(tv.tv_usec/1000.0); // Round to nearest millisec
if (millisec>=1000) // Allow for rounding up to nearest second
{
millisec -=1000;
tv.tv_sec++;
}
millisec = lrint(tv.tv_usec / 1000.0); // Round to nearest millisec
if (millisec >= 1000) // Allow for rounding up to nearest second
{
millisec -= 1000;
tv.tv_sec++;
}
timeinfo = localtime(&tv.tv_sec);
strftime (cpDate,80,"%d/%m/%Y %T",timeinfo);
strftime(cpDate, 80, "%d/%m/%Y %T", timeinfo);
sprintf(buffer, "%s.%03d", cpDate, millisec);
return buffer;
}
@ -147,18 +146,17 @@ string Logger::getTimestamp()
string Logger::getMacAddress()
{
struct ifreq ifr;
int s = socket(AF_INET, SOCK_STREAM,0);
int s = socket(AF_INET, SOCK_STREAM, 0);
strcpy(ifr.ifr_name, "eth0");
if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
{
strcpy(ifr.ifr_name, "eno1");
}
{
strcpy(ifr.ifr_name, "eno1");
}
unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
char buffer [80];
sprintf(buffer,"%02X:%02X:%02X:%02X:%02X:%02X", hwaddr[0], hwaddr[1], hwaddr[2],
char buffer[80];
sprintf(buffer, "%02X:%02X:%02X:%02X:%02X:%02X", hwaddr[0], hwaddr[1], hwaddr[2],
hwaddr[3], hwaddr[4], hwaddr[5]);
close(s);
string tmp = buffer;
@ -174,22 +172,22 @@ string Logger::getMacAddress()
*/
string Logger::padStringMenu(char cBorder, string text, uint8_t u8LineLenght)
{
string result(1,cBorder);
string result(1, cBorder);
uint8_t u8TextSize = text.length();
uint8_t u8Padding = ((u8LineLenght-u8TextSize)/2);
uint8_t u8Padding = ((u8LineLenght - u8TextSize) / 2);
for(uint8_t i = 0 ; i < u8Padding; i++)
{
result.append(" ");
}
for (uint8_t i = 0; i < u8Padding; i++)
{
result.append(" ");
}
result.append(text);
while((uint8_t)result.length() < (u8LineLenght-1))
{
while ((uint8_t)result.length() < (u8LineLenght - 1))
{
result.append(" ");
}
result.append(" ");
}
result.append(string(1, cBorder));
return result;
@ -203,12 +201,12 @@ string Logger::padStringMenu(char cBorder, string text, uint8_t u8LineLenght)
*/
string Logger::menuLine(char cBorder, uint8_t u8LineLenght)
{
string result(1,cBorder);
string result(1, cBorder);
while((uint8_t)result.length() < u8LineLenght)
{
result.append(string(1, cBorder));
}
while ((uint8_t)result.length() < u8LineLenght)
{
result.append(string(1, cBorder));
}
return result;
}
@ -216,18 +214,16 @@ string Logger::menuLine(char cBorder, uint8_t u8LineLenght)
* \brief return a instance of the logger
* \return logger obj
*/
Logger* Logger::logThis()
Logger *Logger::logThis()
{
if (!instanceFlag)
{
single = new Logger(); //create new obj
instanceFlag = true;
return single;
}
{
single = new Logger(); // create new obj
instanceFlag = true;
return single;
}
else
{
return single; //return existing obj
}
{
return single; // return existing obj
}
}