mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 20:46:52 +03:00
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md * Update Changelog.md * Rearange task to CPU (http, camera, mqtt) (#1557) * Streamlined MQTT interlock when not activated & interlock MQTT when WIFI is not connected (#1556) * streamlined mqtt interlock when disabled * Disconnect mqtt client before reboot * Interlock MQTT with WIFI * Update * loglevel to DEBUG * Update * mqtt msg id incremental * new ENABLE_MQTT includes * Loglevel to DEBUG * Loglevel * Update interface_mqtt.cpp * show uptime on overview page, moved labels from firmware to Web UI (#1543) * show uptime on overview page, moved labels from firmware to Web UI * show uptime on info page * also use formated time in log Co-authored-by: CaCO3 <caco@ruinelli.ch> * Continue boot on bad PSRAM (#1558) * add sensor status, show special index/setup page in case of a critical error * continue booting on PSRAM error * Update main.cpp added log messages * init PSRAM and add more log messages * cleanup of init checks * . * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * add sensor status, show special index/setup page in case of a critical error (#1560) * add sensor status, show special index/setup page in case of a critical error * Added Reboot * . * added more buttons Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update Webinstaller to v13.0.7 * remove html-from-11.3.1 in release (#1565) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota Co-authored-by: github-actions <github-actions@github.com> * make the sidebar on the overviw page wider and show the round counter (#1570) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Create reply-bot.yml * Update ClassFlowPostProcessing.cpp * Add bot (#1581) * Update reply-bot.yml * Create label-commenter-config.yml * added missing html change * extended instructions (#1583) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix Rate Problem * removed redundant "Status:" * Bugfix Double Extract ZIP-Files * Update FeatureRequest.md (#1591) in case of position change between the measurments set this state to true, if there is no change set it back to false. In a defined time window this movement can lead into an alarm state / water leak.. haveing this state in the mqtt broker can trigger functions like closing the ater pipe walve and so on... * Update manifest.json * Delete .gitignore * Delete .gitmodules * Delete firmware.bin * Add files via upload * Block REST API calls till resource is ready (#1609) * Block REST API call till ressource is ready * Update * Update * Update * replace relative include of gethost.js with absolute one. This is needed as that file gets incuded on dynamically generated content which can be on different path levels (#1610) Co-authored-by: CaCO3 <caco@ruinelli.ch> * esp_spiram.h has been replaced by esp32/spiram.h (#1605) * esp_spiram.h has been replaced by esp32/spiram.h * Preparations for next Bugfix Release (#1615) * Merge branch 'rolling' (#1559) * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * Update Changelog.md for release Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * new model version (#1619) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota * new models - ana-class100 v1.5.4 - ana-cont-11.0.4 - dig-class100 v1.5.0 Co-authored-by: github-actions <github-actions@github.com> * Update Changelog.md (#1630) * Correct RenameNumber * Update Changelog.md * Fix reloading of data file (#1635) * Update data.html * fixed * show link to graph Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: smartboart <38385805+smartboart@users.noreply.github.com>
420 lines
12 KiB
C++
420 lines
12 KiB
C++
#include "ClassLogFile.h"
|
|
#include "time_sntp.h"
|
|
#include "esp_log.h"
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <algorithm>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
#include <dirent.h>
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#include "Helper.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)
|
|
{
|
|
std::string _zw = _id;
|
|
if (loglevel >= ESP_LOG_DEBUG) {
|
|
_zw = _zw + "\t" + getESPHeapInfo();
|
|
WriteToFile(ESP_LOG_DEBUG, "HEAP", _zw);
|
|
}
|
|
}
|
|
|
|
|
|
std::string ClassLogFile::getESPHeapInfo(){
|
|
string espInfoResultStr = "";
|
|
char aMsgBuf[80];
|
|
|
|
multi_heap_info_t aMultiHead_info ;
|
|
heap_caps_get_info (&aMultiHead_info,MALLOC_CAP_8BIT);
|
|
size_t aFreeHeapSize = heap_caps_get_free_size(MALLOC_CAP_8BIT);
|
|
size_t aMinFreeHeadSize = heap_caps_get_minimum_free_size(MALLOC_CAP_8BIT);
|
|
size_t aMinFreeHeapSize = heap_caps_get_minimum_free_size(MALLOC_CAP_8BIT);
|
|
size_t aHeapLargestFreeBlockSize = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
|
|
sprintf(aMsgBuf,"Free Heap Size: \t%ld", (long) aFreeHeapSize);
|
|
size_t aFreeSPIHeapSize = heap_caps_get_free_size(MALLOC_CAP_8BIT| MALLOC_CAP_SPIRAM);
|
|
size_t aFreeInternalHeapSize = heap_caps_get_free_size(MALLOC_CAP_8BIT| MALLOC_CAP_INTERNAL);
|
|
size_t aMinFreeInternalHeapSize = heap_caps_get_minimum_free_size(MALLOC_CAP_8BIT| MALLOC_CAP_INTERNAL);
|
|
|
|
sprintf(aMsgBuf,"\tHeap:\t%ld", (long) aFreeHeapSize);
|
|
espInfoResultStr += string(aMsgBuf);
|
|
sprintf(aMsgBuf,"\tMin Free:\t%ld", (long) aMinFreeHeapSize);
|
|
espInfoResultStr += string(aMsgBuf);
|
|
sprintf(aMsgBuf,"\tlarg. Block: \t%ld", (long) aHeapLargestFreeBlockSize);
|
|
espInfoResultStr += string(aMsgBuf);
|
|
sprintf(aMsgBuf,"\tSPI Heap:\t%ld", (long) aFreeSPIHeapSize);
|
|
espInfoResultStr += string(aMsgBuf);
|
|
sprintf(aMsgBuf,"\tMin Free Heap Size:\t%ld", (long) aMinFreeHeadSize);
|
|
sprintf(aMsgBuf,"\tNOT_SPI Heap:\t%ld", (long) (aFreeHeapSize - aFreeSPIHeapSize));
|
|
espInfoResultStr += string(aMsgBuf);
|
|
sprintf(aMsgBuf,"\tlargest Block Size: \t%ld", (long) aHeapLargestFreeBlockSize);
|
|
sprintf(aMsgBuf,"\tInternal Heap:\t%ld", (long) (aFreeInternalHeapSize));
|
|
espInfoResultStr += string(aMsgBuf);
|
|
sprintf(aMsgBuf,"\tInternal Min Heap free:\t%ld", (long) (aMinFreeInternalHeapSize));
|
|
espInfoResultStr += string(aMsgBuf);
|
|
return espInfoResultStr;
|
|
}
|
|
|
|
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 _digital, std::string _analog)
|
|
{
|
|
ESP_LOGD(TAG, "Start WriteToData");
|
|
time_t rawtime;
|
|
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 zwtime;
|
|
|
|
ESP_LOGD(TAG, "Datalogfile: %s", logpath.c_str());
|
|
pFile = fopen(logpath.c_str(), "a+");
|
|
|
|
if (pFile!=NULL) {
|
|
fputs(_timestamp.c_str(), pFile);
|
|
fputs(",", pFile);
|
|
fputs(_name.c_str(), pFile);
|
|
fputs(",", pFile);
|
|
fputs(_ReturnRawValue.c_str(), pFile);
|
|
fputs(",", pFile);
|
|
fputs(_ReturnValue.c_str(), pFile);
|
|
fputs(",", pFile);
|
|
fputs(_ReturnPreValue.c_str(), pFile);
|
|
fputs(",", pFile);
|
|
fputs(_ReturnRateValue.c_str(), pFile);
|
|
fputs(",", pFile);
|
|
fputs(_ReturnChangeAbsolute.c_str(), pFile);
|
|
fputs(",", pFile);
|
|
fputs(_ErrorMessageText.c_str(), pFile);
|
|
fputs(_digital.c_str(), pFile);
|
|
fputs(_analog.c_str(), pFile);
|
|
fputs("\n", pFile);
|
|
|
|
fclose(pFile);
|
|
} else {
|
|
ESP_LOGE(TAG, "Can't open data file %s", logpath.c_str());
|
|
}
|
|
|
|
}
|
|
|
|
|
|
void ClassLogFile::WriteToDedicatedFile(std::string _fn, esp_log_level_t level, std::string message, bool _time)
|
|
{
|
|
FILE* pFile;
|
|
std::string zwtime;
|
|
std::string ntpTime = "";
|
|
|
|
if (level > loglevel) {// Only write to file if loglevel is below threshold
|
|
return;
|
|
}
|
|
|
|
// pFile = OpenFileAndWait(_fn.c_str(), "a");
|
|
pFile = fopen(_fn.c_str(), "a+");
|
|
// ESP_LOGD(TAG, "Logfile opened: %s", _fn.c_str());
|
|
|
|
if (pFile!=NULL) {
|
|
if (_time)
|
|
{
|
|
time_t rawtime;
|
|
struct tm* timeinfo;
|
|
char buffer[80];
|
|
|
|
time(&rawtime);
|
|
timeinfo = localtime(&rawtime);
|
|
|
|
strftime(buffer, 80, "%Y-%m-%dT%H:%M:%S", timeinfo);
|
|
|
|
zwtime = std::string(buffer);
|
|
ntpTime = zwtime;
|
|
}
|
|
|
|
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);
|
|
|
|
ntpTime = "[" + formatedUptime + "] " + ntpTime + "\t<" + loglevelString + ">\t" + message + "\n";
|
|
fputs(ntpTime.c_str(), pFile);
|
|
fclose(pFile);
|
|
} else {
|
|
ESP_LOGE(TAG, "Can't open log file %s", _fn.c_str());
|
|
}
|
|
}
|
|
|
|
void ClassLogFile::setLogLevel(esp_log_level_t _logLevel){
|
|
loglevel = _logLevel;
|
|
|
|
std::string levelText;
|
|
|
|
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;
|
|
}
|
|
|
|
ESP_LOGI(TAG, "Log Level set to %s", levelText.c_str());
|
|
|
|
/*
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Test");
|
|
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Test");
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Test");
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Test");
|
|
*/
|
|
}
|
|
|
|
void ClassLogFile::SetLogFileRetention(unsigned short _LogFileRetentionInDays){
|
|
logFileRetentionInDays = _LogFileRetentionInDays;
|
|
}
|
|
|
|
void ClassLogFile::SetDataLogRetention(unsigned short _DataLogRetentionInDays){
|
|
dataLogRetentionInDays = _DataLogRetentionInDays;
|
|
}
|
|
|
|
void ClassLogFile::SetDataLogToSD(bool _doDataLogToSD){
|
|
doDataLogToSD = _doDataLogToSD;
|
|
}
|
|
|
|
bool ClassLogFile::GetDataLogToSD(){
|
|
return doDataLogToSD;
|
|
}
|
|
|
|
void ClassLogFile::WriteToFile(esp_log_level_t level, std::string tag, std::string message, bool _time)
|
|
{
|
|
/*
|
|
struct stat path_stat;
|
|
if (stat(logroot.c_str(), &path_stat) != 0) {
|
|
ESP_LOGI(TAG, "Create log folder: %s", logroot.c_str());
|
|
if (mkdir_r(logroot.c_str(), S_IRWXU) == -1) {
|
|
ESP_LOGE(TAG, "Can't create log folder");
|
|
}
|
|
}
|
|
*/
|
|
time_t rawtime;
|
|
struct tm* timeinfo;
|
|
char buffer[30];
|
|
|
|
time(&rawtime);
|
|
timeinfo = localtime(&rawtime);
|
|
|
|
strftime(buffer, 30, logfile.c_str(), timeinfo);
|
|
std::string logpath = logroot + "/" + buffer;
|
|
|
|
std::replace(message.begin(), message.end(), '\n', ' '); // Replace all newline characters
|
|
|
|
if (tag != "") {
|
|
ESP_LOG_LEVEL(level, tag.c_str(), "%s", message.c_str());
|
|
message = "[" + tag + "] " + message;
|
|
}
|
|
else {
|
|
ESP_LOG_LEVEL(level, "", "%s", message.c_str());
|
|
}
|
|
WriteToDedicatedFile(logpath, level, message, _time);
|
|
}
|
|
|
|
|
|
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;
|
|
char buffer[60];
|
|
|
|
time(&rawtime);
|
|
timeinfo = localtime(&rawtime);
|
|
|
|
strftime(buffer, 60, datafile.c_str(), timeinfo);
|
|
std::string logpath = dataroot + "/" + buffer;
|
|
|
|
return logpath;
|
|
}
|
|
|
|
|
|
std::string ClassLogFile::GetCurrentFileName()
|
|
{
|
|
time_t rawtime;
|
|
struct tm* timeinfo;
|
|
char buffer[60];
|
|
|
|
time(&rawtime);
|
|
timeinfo = localtime(&rawtime);
|
|
|
|
strftime(buffer, 60, logfile.c_str(), timeinfo);
|
|
std::string logpath = logroot + "/" + buffer;
|
|
|
|
return logpath;
|
|
}
|
|
|
|
void ClassLogFile::RemoveOldLogFile()
|
|
{
|
|
if (logFileRetentionInDays == 0) {
|
|
return;
|
|
}
|
|
|
|
ESP_LOGD(TAG, "Remove old log files");
|
|
|
|
time_t rawtime;
|
|
struct tm* timeinfo;
|
|
char cmpfilename[30];
|
|
|
|
time(&rawtime);
|
|
rawtime = addDays(rawtime, -logFileRetentionInDays + 1);
|
|
timeinfo = localtime(&rawtime);
|
|
//ESP_LOGD(TAG, "logFileRetentionInDays: %d", logFileRetentionInDays);
|
|
|
|
|
|
strftime(cmpfilename, 30, logfile.c_str(), timeinfo);
|
|
//ESP_LOGD(TAG, "log file name to compare: %s", cmpfilename);
|
|
|
|
DIR *dir = opendir(logroot.c_str());
|
|
if (!dir) {
|
|
ESP_LOGE(TAG, "Failed to stat dir: %s", logroot.c_str());
|
|
return;
|
|
}
|
|
|
|
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);
|
|
std::string filepath = logroot + "/" + entry->d_name;
|
|
if (unlink(filepath.c_str()) == 0) {
|
|
deleted ++;
|
|
} else {
|
|
ESP_LOGE(TAG, "can't delete file: %s", entry->d_name);
|
|
notDeleted ++;
|
|
}
|
|
} else {
|
|
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) {
|
|
return;
|
|
}
|
|
|
|
ESP_LOGD(TAG, "Remove old data files");
|
|
|
|
time_t rawtime;
|
|
struct tm* timeinfo;
|
|
char cmpfilename[30];
|
|
|
|
time(&rawtime);
|
|
rawtime = addDays(rawtime, -dataLogRetentionInDays + 1);
|
|
timeinfo = localtime(&rawtime);
|
|
//ESP_LOGD(TAG, "dataLogRetentionInDays: %d", dataLogRetentionInDays);
|
|
|
|
strftime(cmpfilename, 30, datafile.c_str(), timeinfo);
|
|
//ESP_LOGD(TAG, "data file name to compare: %s", cmpfilename);
|
|
|
|
DIR *dir = opendir(dataroot.c_str());
|
|
if (!dir) {
|
|
ESP_LOGE(TAG, "Failed to stat dir: %s", dataroot.c_str());
|
|
return;
|
|
}
|
|
|
|
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 ++;
|
|
}
|
|
} else {
|
|
notDeleted ++;
|
|
}
|
|
}
|
|
}
|
|
ESP_LOGD(TAG, "data files deleted: %d | files not deleted (incl. leer.txt): %d", deleted, notDeleted);
|
|
closedir(dir);
|
|
}
|
|
|
|
|
|
void ClassLogFile::CreateLogDirectories()
|
|
{
|
|
MakeDir("/sdcard/log");
|
|
MakeDir("/sdcard/log/data");
|
|
MakeDir("/sdcard/log/analog");
|
|
MakeDir("/sdcard/log/digit");
|
|
MakeDir("/sdcard/log/message");
|
|
MakeDir("/sdcard/log/source");
|
|
}
|
|
|
|
|
|
ClassLogFile::ClassLogFile(std::string _logroot, std::string _logfile, std::string _logdatapath, std::string _datafile)
|
|
{
|
|
logroot = _logroot;
|
|
logfile = _logfile;
|
|
datafile = _datafile;
|
|
dataroot = _logdatapath;
|
|
logFileRetentionInDays = 3;
|
|
dataLogRetentionInDays = 3;
|
|
doDataLogToSD = true;
|
|
loglevel = ESP_LOG_INFO;
|
|
}
|