This commit is contained in:
michael
2026-01-17 02:49:32 +01:00
parent a1ccda2e88
commit 4905663933
283 changed files with 32074 additions and 15759 deletions

View File

@@ -1,3 +1,5 @@
#include "defines.h"
#include "ClassLogFile.h"
#include "time_sntp.h"
#include "esp_log.h"
@@ -7,7 +9,8 @@
#include <algorithm>
#ifdef __cplusplus
extern "C" {
extern "C"
{
#endif
#include <dirent.h>
#ifdef __cplusplus
@@ -16,42 +19,41 @@ extern "C" {
#include "Helper.h"
#include "time_sntp.h"
#include "../../include/defines.h"
static const char *TAG = "LOGFILE";
ClassLogFile LogFile("/sdcard/log/message", "log_%Y-%m-%d.txt", "/sdcard/log/data", "data_%Y-%m-%d.csv");
void ClassLogFile::WriteHeapInfo(std::string _id)
{
if (loglevel >= ESP_LOG_DEBUG) {
std::string _zw = _id + "\t" + getESPHeapInfo();
if (loglevel >= ESP_LOG_DEBUG)
{
std::string _zw = _id + "\t" + get_heapinfo();
WriteToFile(ESP_LOG_DEBUG, "HEAP", _zw);
}
}
void ClassLogFile::WriteToData(std::string _timestamp, std::string _name, std::string _ReturnRawValue, std::string _ReturnValue, std::string _ReturnPreValue, std::string _ReturnRateValue, std::string _ReturnChangeAbsolute, std::string _ErrorMessageText, std::string _digit, std::string _analog)
void ClassLogFile::WriteToData(std::string _timestamp, std::string _name, std::string _ReturnRawValue, std::string _ReturnValue, std::string _ReturnPreValue, std::string _ReturnRateValue, std::string _ReturnChangeAbsolute, std::string _ErrorMessageText, std::string _digit, std::string _analog)
{
ESP_LOGD(TAG, "Start WriteToData");
time_t rawtime;
struct tm* timeinfo;
struct tm *timeinfo;
char buffer[30];
time(&rawtime);
timeinfo = localtime(&rawtime);
strftime(buffer, 30, datafile.c_str(), timeinfo);
std::string logpath = dataroot + "/" + buffer;
FILE* pFile;
std::string logpath = dataroot + "/" + buffer;
FILE *pFile;
std::string zwtime;
ESP_LOGD(TAG, "Datalogfile: %s", logpath.c_str());
pFile = fopen(logpath.c_str(), "a+");
if (pFile!=NULL) {
if (pFile != NULL)
{
fputs(_timestamp.c_str(), pFile);
fputs(",", pFile);
fputs(_name.c_str(), pFile);
@@ -71,36 +73,37 @@ void ClassLogFile::WriteToData(std::string _timestamp, std::string _name, std::s
fputs(_analog.c_str(), pFile);
fputs("\n", pFile);
fclose(pFile);
} else {
fclose(pFile);
}
else
{
ESP_LOGE(TAG, "Can't open data file %s", logpath.c_str());
}
}
void ClassLogFile::setLogLevel(esp_log_level_t _logLevel)
{
std::string levelText;
// Print log level to log file
switch(_logLevel) {
case ESP_LOG_WARN:
levelText = "WARNING";
break;
case ESP_LOG_INFO:
levelText = "INFO";
break;
case ESP_LOG_DEBUG:
levelText = "DEBUG";
break;
case ESP_LOG_ERROR:
default:
levelText = "ERROR";
break;
switch (_logLevel)
{
case ESP_LOG_WARN:
levelText = "WARNING";
break;
case ESP_LOG_INFO:
levelText = "INFO";
break;
case ESP_LOG_DEBUG:
levelText = "DEBUG";
break;
case ESP_LOG_ERROR:
default:
levelText = "ERROR";
break;
}
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Set log level to " + levelText);
@@ -115,40 +118,38 @@ void ClassLogFile::setLogLevel(esp_log_level_t _logLevel)
*/
}
void ClassLogFile::SetLogFileRetention(unsigned short _LogFileRetentionInDays){
void ClassLogFile::SetLogFileRetention(unsigned short _LogFileRetentionInDays)
{
logFileRetentionInDays = _LogFileRetentionInDays;
}
void ClassLogFile::SetDataLogRetention(unsigned short _DataLogRetentionInDays){
void ClassLogFile::SetDataLogRetention(unsigned short _DataLogRetentionInDays)
{
dataLogRetentionInDays = _DataLogRetentionInDays;
}
void ClassLogFile::SetDataLogToSD(bool _doDataLogToSD){
void ClassLogFile::SetDataLogToSD(bool _doDataLogToSD)
{
doDataLogToSD = _doDataLogToSD;
}
bool ClassLogFile::GetDataLogToSD(){
bool ClassLogFile::GetDataLogToSD()
{
return doDataLogToSD;
}
static FILE* logFileAppendHandle = NULL;
static FILE *logFileAppendHandle = NULL;
std::string fileNameDate;
void ClassLogFile::WriteToFile(esp_log_level_t level, std::string tag, std::string message, bool _time)
{
time_t rawtime;
struct tm* timeinfo;
struct tm *timeinfo;
std::string fileNameDateNew;
std::string zwtime;
std::string ntpTime = "";
time(&rawtime);
timeinfo = localtime(&rawtime);
char buf[30];
@@ -157,20 +158,21 @@ void ClassLogFile::WriteToFile(esp_log_level_t level, std::string tag, std::stri
std::replace(message.begin(), message.end(), '\n', ' '); // Replace all newline characters
if (tag != "") {
if (tag != "")
{
ESP_LOG_LEVEL(level, tag.c_str(), "%s", message.c_str());
message = "[" + tag + "] " + message;
}
else {
else
{
ESP_LOG_LEVEL(level, "", "%s", message.c_str());
}
if (level > loglevel) {// Only write to file if loglevel is below threshold
if (level > loglevel)
{ // Only write to file if loglevel is below threshold
return;
}
if (_time)
{
char logLineDate[30];
@@ -178,43 +180,45 @@ void ClassLogFile::WriteToFile(esp_log_level_t level, std::string tag, std::stri
ntpTime = std::string(logLineDate);
}
std::string loglevelString;
switch(level) {
case ESP_LOG_ERROR:
loglevelString = "ERR";
break;
case ESP_LOG_WARN:
loglevelString = "WRN";
break;
case ESP_LOG_INFO:
loglevelString = "INF";
break;
case ESP_LOG_DEBUG:
loglevelString = "DBG";
break;
case ESP_LOG_VERBOSE:
loglevelString = "VER";
break;
case ESP_LOG_NONE:
default:
loglevelString = "NONE";
break;
std::string loglevelString;
switch (level)
{
case ESP_LOG_ERROR:
loglevelString = "ERR";
break;
case ESP_LOG_WARN:
loglevelString = "WRN";
break;
case ESP_LOG_INFO:
loglevelString = "INF";
break;
case ESP_LOG_DEBUG:
loglevelString = "DBG";
break;
case ESP_LOG_VERBOSE:
loglevelString = "VER";
break;
case ESP_LOG_NONE:
default:
loglevelString = "NONE";
break;
}
std::string formatedUptime = getFormatedUptime(true);
std::string fullmessage = "[" + formatedUptime + "] " + ntpTime + "\t<" + loglevelString + ">\t" + message + "\n";
std::string formatedUptime = get_formated_uptime(true);
std::string fullmessage = "[" + formatedUptime + "] " + ntpTime + "\t<" + loglevelString + ">\t" + message + "\n";
#ifdef KEEP_LOGFILE_OPEN_FOR_APPENDING
if (fileNameDateNew != fileNameDate) { // Filename changed
if (fileNameDateNew != fileNameDate)
{ // Filename changed
// Make sure each day gets its own logfile
// Also we need to re-open it in case it needed to get closed for reading
std::string logpath = logroot + "/" + fileNameDateNew;
std::string logpath = logroot + "/" + fileNameDateNew;
ESP_LOGI(TAG, "Opening logfile %s for appending", logpath.c_str());
logFileAppendHandle = fopen(logpath.c_str(), "a+");
if (logFileAppendHandle==NULL) {
if (logFileAppendHandle == NULL)
{
ESP_LOGE(TAG, "Can't open log file %s", logpath.c_str());
return;
}
@@ -222,16 +226,17 @@ void ClassLogFile::WriteToFile(esp_log_level_t level, std::string tag, std::stri
fileNameDate = fileNameDateNew;
}
#else
std::string logpath = logroot + "/" + fileNameDateNew;
std::string logpath = logroot + "/" + fileNameDateNew;
logFileAppendHandle = fopen(logpath.c_str(), "a+");
if (logFileAppendHandle==NULL) {
if (logFileAppendHandle == NULL)
{
ESP_LOGE(TAG, "Can't open log file %s", logpath.c_str());
return;
}
#endif
#endif
fputs(fullmessage.c_str(), logFileAppendHandle);
#ifdef KEEP_LOGFILE_OPEN_FOR_APPENDING
fflush(logFileAppendHandle);
fsync(fileno(logFileAppendHandle));
@@ -240,76 +245,75 @@ void ClassLogFile::WriteToFile(esp_log_level_t level, std::string tag, std::stri
#endif
}
void ClassLogFile::CloseLogFileAppendHandle() {
if (logFileAppendHandle != NULL) {
void ClassLogFile::CloseLogFileAppendHandle()
{
if (logFileAppendHandle != NULL)
{
fclose(logFileAppendHandle);
logFileAppendHandle = NULL;
fileNameDate = "";
}
}
void ClassLogFile::WriteToFile(esp_log_level_t level, std::string tag, std::string message) {
void ClassLogFile::WriteToFile(esp_log_level_t level, std::string tag, std::string message)
{
LogFile.WriteToFile(level, tag, message, true);
}
std::string ClassLogFile::GetCurrentFileNameData()
{
time_t rawtime;
struct tm* timeinfo;
struct tm *timeinfo;
char buffer[60];
time(&rawtime);
timeinfo = localtime(&rawtime);
strftime(buffer, 60, datafile.c_str(), timeinfo);
std::string logpath = dataroot + "/" + buffer;
std::string logpath = dataroot + "/" + buffer;
return logpath;
}
std::string ClassLogFile::GetCurrentFileName()
{
time_t rawtime;
struct tm* timeinfo;
struct tm *timeinfo;
char buffer[60];
time(&rawtime);
timeinfo = localtime(&rawtime);
strftime(buffer, 60, logfile.c_str(), timeinfo);
std::string logpath = logroot + "/" + buffer;
std::string logpath = logroot + "/" + buffer;
return logpath;
}
void ClassLogFile::RemoveOldLogFile()
{
if (logFileRetentionInDays == 0) {
if (logFileRetentionInDays == 0)
{
return;
}
ESP_LOGD(TAG, "Remove old log files");
time_t rawtime;
struct tm* timeinfo;
struct tm *timeinfo;
char cmpfilename[30];
time(&rawtime);
rawtime = addDays(rawtime, -logFileRetentionInDays + 1);
rawtime = add_days(rawtime, -logFileRetentionInDays + 1);
timeinfo = localtime(&rawtime);
//ESP_LOGD(TAG, "logFileRetentionInDays: %d", logFileRetentionInDays);
// ESP_LOGD(TAG, "logFileRetentionInDays: %d", logFileRetentionInDays);
strftime(cmpfilename, 30, logfile.c_str(), timeinfo);
//ESP_LOGD(TAG, "log file name to compare: %s", cmpfilename);
// ESP_LOGD(TAG, "log file name to compare: %s", cmpfilename);
DIR *dir = opendir(logroot.c_str());
if (!dir) {
if (!dir)
{
ESP_LOGE(TAG, "Failed to stat dir: %s", logroot.c_str());
return;
}
@@ -317,58 +321,67 @@ void ClassLogFile::RemoveOldLogFile()
struct dirent *entry;
int deleted = 0;
int notDeleted = 0;
while ((entry = readdir(dir)) != NULL) {
if (entry->d_type == DT_REG) {
//ESP_LOGD(TAG, "compare log file: %s to %s", entry->d_name, cmpfilename);
if ((strlen(entry->d_name) == strlen(cmpfilename)) && (strcmp(entry->d_name, cmpfilename) < 0)) {
//ESP_LOGD(TAG, "delete log file: %s", entry->d_name);
while ((entry = readdir(dir)) != NULL)
{
if (entry->d_type == DT_REG)
{
// ESP_LOGD(TAG, "compare log file: %s to %s", entry->d_name, cmpfilename);
if ((strlen(entry->d_name) == strlen(cmpfilename)) && (strcmp(entry->d_name, cmpfilename) < 0))
{
// ESP_LOGD(TAG, "delete log file: %s", entry->d_name);
std::string filepath = logroot + "/" + entry->d_name;
if ((strcmp(entry->d_name, "log_1970-01-01.txt") == 0) && getTimeWasNotSetAtBoot()) { // keep logfile log_1970-01-01.txt if time was not set at boot (some boot logs are in there)
//ESP_LOGD(TAG, "Skip deleting this file: %s", entry->d_name);
if ((strcmp(entry->d_name, "log_1970-01-01.txt") == 0) && getTimeWasNotSetAtBoot())
{ // keep logfile log_1970-01-01.txt if time was not set at boot (some boot logs are in there)
// ESP_LOGD(TAG, "Skip deleting this file: %s", entry->d_name);
notDeleted++;
}
else {
if (unlink(filepath.c_str()) == 0) {
else
{
if (unlink(filepath.c_str()) == 0)
{
deleted++;
}
else {
}
else
{
ESP_LOGE(TAG, "can't delete file: %s", entry->d_name);
notDeleted++;
}
}
}
else {
}
else
{
notDeleted++;
}
}
}
ESP_LOGD(TAG, "log files deleted: %d | files not deleted (incl. leer.txt): %d", deleted, notDeleted);
ESP_LOGD(TAG, "log files deleted: %d | files not deleted (incl. leer.txt): %d", deleted, notDeleted);
closedir(dir);
}
void ClassLogFile::RemoveOldDataLog()
{
if (dataLogRetentionInDays == 0 || !doDataLogToSD) {
if (dataLogRetentionInDays == 0 || !doDataLogToSD)
{
return;
}
ESP_LOGD(TAG, "Remove old data files");
time_t rawtime;
struct tm* timeinfo;
struct tm *timeinfo;
char cmpfilename[30];
time(&rawtime);
rawtime = addDays(rawtime, -dataLogRetentionInDays + 1);
rawtime = add_days(rawtime, -dataLogRetentionInDays + 1);
timeinfo = localtime(&rawtime);
//ESP_LOGD(TAG, "dataLogRetentionInDays: %d", dataLogRetentionInDays);
// ESP_LOGD(TAG, "dataLogRetentionInDays: %d", dataLogRetentionInDays);
strftime(cmpfilename, 30, datafile.c_str(), timeinfo);
//ESP_LOGD(TAG, "data file name to compare: %s", cmpfilename);
// ESP_LOGD(TAG, "data file name to compare: %s", cmpfilename);
DIR *dir = opendir(dataroot.c_str());
if (!dir) {
if (!dir)
{
ESP_LOGE(TAG, "Failed to stat dir: %s", dataroot.c_str());
return;
}
@@ -376,46 +389,52 @@ void ClassLogFile::RemoveOldDataLog()
struct dirent *entry;
int deleted = 0;
int notDeleted = 0;
while ((entry = readdir(dir)) != NULL) {
if (entry->d_type == DT_REG) {
//ESP_LOGD(TAG, "Compare data file: %s to %s", entry->d_name, cmpfilename);
if ((strlen(entry->d_name) == strlen(cmpfilename)) && (strcmp(entry->d_name, cmpfilename) < 0)) {
//ESP_LOGD(TAG, "delete data file: %s", entry->d_name);
std::string filepath = dataroot + "/" + entry->d_name;
if (unlink(filepath.c_str()) == 0) {
deleted ++;
} else {
ESP_LOGE(TAG, "can't delete file: %s", entry->d_name);
notDeleted ++;
while ((entry = readdir(dir)) != NULL)
{
if (entry->d_type == DT_REG)
{
// ESP_LOGD(TAG, "Compare data file: %s to %s", entry->d_name, cmpfilename);
if ((strlen(entry->d_name) == strlen(cmpfilename)) && (strcmp(entry->d_name, cmpfilename) < 0))
{
// ESP_LOGD(TAG, "delete data file: %s", entry->d_name);
std::string filepath = dataroot + "/" + entry->d_name;
if (unlink(filepath.c_str()) == 0)
{
deleted++;
}
} else {
notDeleted ++;
else
{
ESP_LOGE(TAG, "can't delete file: %s", entry->d_name);
notDeleted++;
}
}
else
{
notDeleted++;
}
}
}
ESP_LOGD(TAG, "data files deleted: %d | files not deleted (incl. leer.txt): %d", deleted, notDeleted);
ESP_LOGD(TAG, "data files deleted: %d | files not deleted (incl. leer.txt): %d", deleted, notDeleted);
closedir(dir);
}
bool ClassLogFile::CreateLogDirectories()
{
bool bRetval = false;
bRetval = MakeDir("/sdcard/log");
bRetval = MakeDir("/sdcard/log/data");
bRetval = MakeDir("/sdcard/log/analog");
bRetval = MakeDir("/sdcard/log/digit");
bRetval = MakeDir("/sdcard/log/message");
bRetval = MakeDir("/sdcard/log/source");
bRetval = make_dir("/sdcard/log");
bRetval = make_dir("/sdcard/log/data");
bRetval = make_dir("/sdcard/log/analog");
bRetval = make_dir("/sdcard/log/digit");
bRetval = make_dir("/sdcard/log/message");
bRetval = make_dir("/sdcard/log/source");
return bRetval;
}
ClassLogFile::ClassLogFile(std::string _logroot, std::string _logfile, std::string _logdatapath, std::string _datafile)
{
logroot = _logroot;
logfile = _logfile;
logfile = _logfile;
datafile = _datafile;
dataroot = _logdatapath;
logFileRetentionInDays = 3;