From 90fa44380c3f53e20c6748f2c67a825859f49501 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Sat, 25 Feb 2023 21:18:56 +0100 Subject: [PATCH] Migrate some UART logs to Logfile logs (#2079) * repolaced ESP_LOGE() with LogFile.WriteToFile(ESP_LOG_ERROR() * converted more UART logs to logfile logs --------- Co-authored-by: CaCO3 --- .../jomjol_fileserver_ota/server_file.cpp | 79 ++++++++++--------- .../jomjol_fileserver_ota/server_ota.cpp | 54 ++++++------- 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/code/components/jomjol_fileserver_ota/server_file.cpp b/code/components/jomjol_fileserver_ota/server_file.cpp index 3c795f24..07a2c7c0 100644 --- a/code/components/jomjol_fileserver_ota/server_file.cpp +++ b/code/components/jomjol_fileserver_ota/server_file.cpp @@ -228,7 +228,7 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const if (chunksize > 0){ if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) { fclose(fd); - ESP_LOGE(TAG, "File sending failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File sending failed!"); return ESP_FAIL; } } @@ -267,7 +267,7 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const strlcpy(entrypath + dirpath_len, entry->d_name, sizeof(entrypath) - dirpath_len); ESP_LOGD(TAG, "Entrypath: %s", entrypath); if (stat(entrypath, &entry_stat) == -1) { - ESP_LOGE(TAG, "Failed to stat %s: %s", entrytype, entry->d_name); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to stat " + string(entrytype) + ": " + string(entry->d_name)); continue; } @@ -357,7 +357,7 @@ static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file) fd = fopen(currentfilename.c_str(), "r"); if (!fd) { - LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read file: " + std::string(currentfilename) +"!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read file: " + currentfilename + "!"); /* Respond with 404 Error */ httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404()); return ESP_FAIL; @@ -373,7 +373,7 @@ static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file) /* Adapted from https://www.geeksforgeeks.org/implement-your-own-tail-read-last-n-lines-of-a-huge-file/ */ if (fseek(fd, 0, SEEK_END)) { - ESP_LOGE(TAG, "Failed to get to end of file!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to get to end of file!"); return ESP_FAIL; } else { @@ -381,7 +381,7 @@ static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file) ESP_LOGI(TAG, "File contains %ld bytes", pos); if (fseek(fd, pos - std::min((long)LOGFILE_LAST_PART_BYTES, pos), SEEK_SET)) { // Go LOGFILE_LAST_PART_BYTES bytes back from EOF - ESP_LOGE(TAG, "Failed to go back %ld bytes within the file!", std::min((long)LOGFILE_LAST_PART_BYTES, pos)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to go back " + to_string(std::min((long)LOGFILE_LAST_PART_BYTES, pos)) + " bytes within the file!"); return ESP_FAIL; } } @@ -404,7 +404,7 @@ static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file) /* Send the buffer contents as HTTP response chunk */ if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) { fclose(fd); - ESP_LOGE(TAG, "File sending failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File sending failed!"); /* Abort sending file */ httpd_resp_sendstr_chunk(req, NULL); /* Respond with 500 Internal Server Error */ @@ -443,7 +443,7 @@ static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file) fd = fopen(currentfilename.c_str(), "r"); if (!fd) { - LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read file: " + std::string(currentfilename.c_str()) +"!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read file: " + currentfilename + "!"); /* Respond with 404 Error */ httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404()); return ESP_FAIL; @@ -459,7 +459,7 @@ static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file) /* Adapted from https://www.geeksforgeeks.org/implement-your-own-tail-read-last-n-lines-of-a-huge-file/ */ if (fseek(fd, 0, SEEK_END)) { - ESP_LOGE(TAG, "Failed to get to end of file!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to get to end of file!"); return ESP_FAIL; } else { @@ -467,7 +467,7 @@ static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file) ESP_LOGI(TAG, "File contains %ld bytes", pos); if (fseek(fd, pos - std::min((long)LOGFILE_LAST_PART_BYTES, pos), SEEK_SET)) { // Go LOGFILE_LAST_PART_BYTES bytes back from EOF - ESP_LOGE(TAG, "Failed to go back %ld bytes within the file!", std::min((long)LOGFILE_LAST_PART_BYTES, pos)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to go back " + to_string(std::min((long)LOGFILE_LAST_PART_BYTES, pos)) + " bytes within the file!"); return ESP_FAIL; } } @@ -490,7 +490,7 @@ static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file) /* Send the buffer contents as HTTP response chunk */ if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) { fclose(fd); - ESP_LOGE(TAG, "File sending failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File sending failed!"); /* Abort sending file */ httpd_resp_sendstr_chunk(req, NULL); /* Respond with 500 Internal Server Error */ @@ -530,7 +530,7 @@ static esp_err_t download_get_handler(httpd_req_t *req) if (!filename) { - ESP_LOGE(TAG, "Filename is too long"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Filename is too long"); /* Respond with 414 Error */ httpd_resp_send_err(req, HTTPD_414_URI_TOO_LONG, "Filename too long"); return ESP_FAIL; @@ -571,7 +571,7 @@ static esp_err_t download_get_handler(httpd_req_t *req) fd = fopen(filepath, "r"); if (!fd) { - LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read file: " + std::string(filepath) +"!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read file: " + std::string(filepath) + "!"); /* Respond with 404 Error */ httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404()); return ESP_FAIL; @@ -592,7 +592,7 @@ static esp_err_t download_get_handler(httpd_req_t *req) /* Send the buffer contents as HTTP response chunk */ if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) { fclose(fd); - ESP_LOGE(TAG, "File sending failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File sending failed!"); /* Abort sending file */ httpd_resp_sendstr_chunk(req, NULL); /* Respond with 500 Internal Server Error */ @@ -634,14 +634,14 @@ static esp_err_t upload_post_handler(httpd_req_t *req) /* Filename cannot have a trailing '/' */ if (filename[strlen(filename) - 1] == '/') { - ESP_LOGE(TAG, "Invalid filename: %s", filename); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Invalid filename: " + string(filename)); /* Respond with 400 Bad Request */ httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "Invalid filename"); return ESP_FAIL; } if (stat(filepath, &file_stat) == 0) { - ESP_LOGE(TAG, "File already exists: %s", filepath); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File already exists: " + string(filepath)); /* Respond with 400 Bad Request */ httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "File already exists"); return ESP_FAIL; @@ -649,7 +649,7 @@ static esp_err_t upload_post_handler(httpd_req_t *req) /* File cannot be larger than a limit */ if (req->content_len > MAX_FILE_SIZE) { - ESP_LOGE(TAG, "File too large: %d bytes", req->content_len); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File too large: " + to_string(req->content_len) + " bytes"); /* Respond with 400 Bad Request */ httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "File size must be less than " @@ -661,7 +661,7 @@ static esp_err_t upload_post_handler(httpd_req_t *req) fd = fopen(filepath, "w"); if (!fd) { - ESP_LOGE(TAG, "Failed to create file: %s", filepath); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to create file: " + string(filepath)); /* Respond with 500 Internal Server Error */ httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to create file"); return ESP_FAIL; @@ -692,7 +692,7 @@ static esp_err_t upload_post_handler(httpd_req_t *req) fclose(fd); unlink(filepath); - ESP_LOGE(TAG, "File reception failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File reception failed!"); /* Respond with 500 Internal Server Error */ httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to receive file"); return ESP_FAIL; @@ -705,7 +705,7 @@ static esp_err_t upload_post_handler(httpd_req_t *req) fclose(fd); unlink(filepath); - ESP_LOGE(TAG, "File write failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File write failed!"); /* Respond with 500 Internal Server Error */ httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to write file to storage"); return ESP_FAIL; @@ -780,7 +780,7 @@ static esp_err_t delete_post_handler(httpd_req_t *req) if (httpd_query_key_value(_query, "task", _valuechar, 30) == ESP_OK) { - ESP_LOGD(TAG, "task is found: %s", _valuechar); + LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "task is found: " + string(_valuechar)); _task = std::string(_valuechar); } } @@ -826,26 +826,26 @@ static esp_err_t delete_post_handler(httpd_req_t *req) /* Filename cannot have a trailing '/' */ if (filename[strlen(filename) - 1] == '/') { - ESP_LOGE(TAG, "Invalid filename: %s", filename); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Invalid filename: " + string(filename)); /* Respond with 400 Bad Request */ httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "Invalid filename"); return ESP_FAIL; } if (strcmp(filename, "wlan.ini") == 0) { - ESP_LOGE(TAG, "Trying to delete protected file : %s", filename); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to delete protected file : " + string(filename)); httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Not allowed to delete wlan.ini"); return ESP_FAIL; } if (stat(filepath, &file_stat) == -1) { - ESP_LOGE(TAG, "File does not exist: %s", filename); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File does not exist: " + string(filename)); /* Respond with 400 Bad Request */ httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "File does not exist"); return ESP_FAIL; } - ESP_LOGI(TAG, "Deleting file: %s", filename); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Deleting file: " + string(filename)); /* Delete file */ unlink(filepath); @@ -887,7 +887,7 @@ void delete_all_in_directory(std::string _directory) std::string filename; if (!dir) { - ESP_LOGE(TAG, "Failed to stat dir: %s", _directory.c_str()); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to stat dir: " + _directory); return; } @@ -896,7 +896,7 @@ void delete_all_in_directory(std::string _directory) if (!(entry->d_type == DT_DIR)){ if (strcmp("wlan.ini", entry->d_name) != 0){ // auf wlan.ini soll nicht zugegriffen werden !!! filename = _directory + "/" + std::string(entry->d_name); - ESP_LOGI(TAG, "Deleting file: %s", filename.c_str()); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Deleting file: " + filename); /* Delete file */ unlink(filename.c_str()); } @@ -930,7 +930,7 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st // Get and print information about each file in the archive. int numberoffiles = (int)mz_zip_reader_get_num_files(&zip_archive); - ESP_LOGI(TAG, "Numbers of files to be extracted: %d", numberoffiles); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Numbers of files to be extracted: " + to_string(numberoffiles)); sort_iter = 0; { @@ -953,7 +953,7 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st p = mz_zip_reader_extract_file_to_heap(&zip_archive, archive_filename, &uncomp_size, 0); if (!p) { - ESP_LOGE(TAG, "mz_zip_reader_extract_file_to_heap() failed on file %s", archive_filename); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "mz_zip_reader_extract_file_to_heap() failed on file " + string(archive_filename)); mz_zip_reader_end(&zip_archive); return ret; } @@ -1015,21 +1015,22 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st else { isokay = false; - ESP_LOGD(TAG, "ERROR in writting extracted file (function fwrite) extracted file \"%s\", size %u", archive_filename, (uint)uncomp_size); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "ERROR in writting extracted file (function fwrite) extracted file \"" + + string(archive_filename) + "\", size " + to_string(uncomp_size)); } DeleteFile(zw); if (!isokay) - ESP_LOGE(TAG, "ERROR in fwrite \"%s\", size %u", archive_filename, (uint)uncomp_size); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "ERROR in fwrite \"" + string(archive_filename) + "\", size " + to_string(uncomp_size)); isokay = isokay && RenameFile(filename_zw, zw); if (!isokay) - ESP_LOGE(TAG, "ERROR in Rename \"%s\" to \"%s\"", filename_zw.c_str(), zw.c_str()); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "ERROR in Rename \"" + filename_zw + "\" to \"" + zw); if (isokay) - ESP_LOGI(TAG, "Successfully extracted file \"%s\", size %u", archive_filename, (uint)uncomp_size); + LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Successfully extracted file \"" + string(archive_filename) + "\", size " + to_string(uncomp_size)); else { - ESP_LOGE(TAG, "ERROR in extracting file \"%s\", size %u", archive_filename, (uint)uncomp_size); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "ERROR in extracting file \"" + string(archive_filename) + "\", size " + to_string(uncomp_size)); ret = "ERROR"; } mz_free(p); @@ -1063,7 +1064,7 @@ void unzip(std::string _in_zip_file, std::string _target_directory){ status = mz_zip_reader_init_file(&zip_archive, _in_zip_file.c_str(), 0); if (!status) { - ESP_LOGD(TAG, "mz_zip_reader_init_file() failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "mz_zip_reader_init_file() failed!"); return; } @@ -1075,7 +1076,7 @@ void unzip(std::string _in_zip_file, std::string _target_directory){ status = mz_zip_reader_init_file(&zip_archive, _in_zip_file.c_str(), sort_iter ? MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY : 0); if (!status) { - ESP_LOGD(TAG, "mz_zip_reader_init_file() failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "mz_zip_reader_init_file() failed!"); return; } @@ -1089,7 +1090,7 @@ void unzip(std::string _in_zip_file, std::string _target_directory){ p = mz_zip_reader_extract_file_to_heap(&zip_archive, archive_filename, &uncomp_size, 0); if (!p) { - ESP_LOGD(TAG, "mz_zip_reader_extract_file_to_heap() failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "mz_zip_reader_extract_file_to_heap() failed!"); mz_zip_reader_end(&zip_archive); return; } @@ -1125,19 +1126,19 @@ void register_server_file_uri(httpd_handle_t server, const char *base_path) /* Validate file storage base path */ if (!base_path) { // if (!base_path || strcmp(base_path, "/spiffs") != 0) { - ESP_LOGE(TAG, "File server base_path not set"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File server base_path not set"); // return ESP_ERR_INVALID_ARG; } if (server_data) { - ESP_LOGE(TAG, "File server already started"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File server already started"); // return ESP_ERR_INVALID_STATE; } /* Allocate memory for server data */ server_data = (file_server_data *) calloc(1, sizeof(struct file_server_data)); if (!server_data) { - ESP_LOGE(TAG, "Failed to allocate memory for server data"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to allocate memory for server data"); // return ESP_ERR_NO_MEM; } strlcpy(server_data->base_path, base_path, diff --git a/code/components/jomjol_fileserver_ota/server_ota.cpp b/code/components/jomjol_fileserver_ota/server_ota.cpp index 5c668b29..14390925 100644 --- a/code/components/jomjol_fileserver_ota/server_ota.cpp +++ b/code/components/jomjol_fileserver_ota/server_ota.cpp @@ -57,9 +57,9 @@ bool initial_setup = false; static void infinite_loop(void) { int i = 0; - ESP_LOGI(TAG, "When a new firmware is available on the server, press the reset button to download it"); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "When a new firmware is available on the server, press the reset button to download it"); while(1) { - ESP_LOGI(TAG, "Waiting for a new firmware... %d", ++i); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Waiting for a new firmware... (" + to_string(++i) + ")"); vTaskDelay(1000 / portTICK_PERIOD_MS); } } @@ -123,8 +123,7 @@ void CheckUpdate() std::string _szw = std::string(zw); if (_szw == "init") { - LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Inital setup triggered"); - initial_setup = true; + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Inital Setup triggered"); } } @@ -152,10 +151,10 @@ static bool ota_update_task(std::string fn) const esp_partition_t *configured = esp_ota_get_boot_partition(); const esp_partition_t *running = esp_ota_get_running_partition(); - if (configured != running) { - ESP_LOGW(TAG, "Configured OTA boot partition at offset 0x%08x, but running from offset 0x%08x", - configured->address, running->address); - ESP_LOGW(TAG, "(This can happen if either the OTA boot data or preferred boot image become somehow corrupted.)"); + if (configured != running) { + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Configured OTA boot partition at offset " + to_string(configured->address) + + ", but running from offset " + to_string(running->address)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "(This can happen if either the OTA boot data or preferred boot image become somehow corrupted.)"); } ESP_LOGI(TAG, "Running partition type %d subtype %d (offset 0x%08x)", running->type, running->subtype, running->address); @@ -183,7 +182,7 @@ static bool ota_update_task(std::string fn) while (data_read > 0) { if (data_read < 0) { - ESP_LOGE(TAG, "Error: SSL data read error"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Error: SSL data read error"); return false; } else if (data_read > 0) { if (image_header_was_checked == false) { @@ -207,16 +206,17 @@ static bool ota_update_task(std::string fn) // check current version with last invalid partition if (last_invalid_app != NULL) { if (memcmp(invalid_app_info.version, new_app_info.version, sizeof(new_app_info.version)) == 0) { - ESP_LOGW(TAG, "New version is the same as invalid version."); - ESP_LOGW(TAG, "Previously, there was an attempt to launch the firmware with %s version, but it failed.", invalid_app_info.version); - ESP_LOGW(TAG, "The firmware has been rolled back to the previous version."); + LogFile.WriteToFile(ESP_LOG_WARN, TAG, "New version is the same as invalid version"); + LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Previously, there was an attempt to launch the firmware with " + + string(invalid_app_info.version) + " version, but it failed"); + LogFile.WriteToFile(ESP_LOG_WARN, TAG, "The firmware has been rolled back to the previous version"); infinite_loop(); } } /* if (memcmp(new_app_info.version, running_app_info.version, sizeof(new_app_info.version)) == 0) { - ESP_LOGW(TAG, "Current running version is the same as a new. We will not continue the update."); + LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Current running version is the same as a new. We will not continue the update"); infinite_loop(); } */ @@ -224,12 +224,12 @@ static bool ota_update_task(std::string fn) err = esp_ota_begin(update_partition, OTA_SIZE_UNKNOWN, &update_handle); if (err != ESP_OK) { - ESP_LOGE(TAG, "esp_ota_begin failed (%s)", esp_err_to_name(err)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "esp_ota_begin failed (" + string(esp_err_to_name(err)) + ")"); return false; } ESP_LOGI(TAG, "esp_ota_begin succeeded"); } else { - ESP_LOGE(TAG, "received package is not fit len"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "received package is not fit len"); return false; } } @@ -245,7 +245,7 @@ static bool ota_update_task(std::string fn) // * `errno` to check for underlying transport connectivity closure if any // if (errno == ECONNRESET || errno == ENOTCONN) { - ESP_LOGE(TAG, "Connection closed, errno = %d", errno); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Connection closed, errno = " + to_string(errno)); break; } } @@ -258,15 +258,15 @@ static bool ota_update_task(std::string fn) err = esp_ota_end(update_handle); if (err != ESP_OK) { if (err == ESP_ERR_OTA_VALIDATE_FAILED) { - ESP_LOGE(TAG, "Image validation failed, image is corrupted"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Image validation failed, image is corrupted"); } - ESP_LOGE(TAG, "esp_ota_end failed (%s)!", esp_err_to_name(err)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "esp_ota_end failed (" + string(esp_err_to_name(err)) + ")!"); return false; } err = esp_ota_set_boot_partition(update_partition); if (err != ESP_OK) { - ESP_LOGE(TAG, "esp_ota_set_boot_partition failed (%s)!", esp_err_to_name(err)); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "esp_ota_set_boot_partition failed (" + string(esp_err_to_name(err)) + ")!"); } // ESP_LOGI(TAG, "Prepare to restart system!"); @@ -333,7 +333,7 @@ void CheckOTAUpdate(void) ESP_LOGI(TAG, "Diagnostics completed successfully! Continuing execution..."); esp_ota_mark_app_valid_cancel_rollback(); } else { - ESP_LOGE(TAG, "Diagnostics failed! Start rollback to the previous version..."); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Diagnostics failed! Start rollback to the previous version..."); esp_ota_mark_app_invalid_rollback_and_reboot(); } } @@ -357,7 +357,7 @@ void CheckOTAUpdate(void) ESP_LOGI(TAG, "Diagnostics completed successfully! Continuing execution..."); esp_ota_mark_app_valid_cancel_rollback(); } else { - ESP_LOGE(TAG, "Diagnostics failed! Start rollback to the previous version..."); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Diagnostics failed! Start rollback to the previous version..."); esp_ota_mark_app_invalid_rollback_and_reboot(); } } @@ -449,7 +449,7 @@ esp_err_t handler_ota_update(httpd_req_t *req) if ((filetype == "ZIP") || (filetype == "BIN")) { FILE *pfile; - LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Update for reboot."); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Update for reboot"); pfile = fopen("/sdcard/update.txt", "w"); fwrite(fn.c_str(), fn.length(), 1, pfile); fclose(pfile); @@ -526,7 +526,7 @@ esp_err_t handler_ota_update(httpd_req_t *req) } else { - ESP_LOGD(TAG, "File does not exist: %s", fn.c_str()); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File does not exist: " + fn); } /* Respond with an empty chunk to signal HTTP response completion */ std::string zw = "file deleted\n"; @@ -541,7 +541,7 @@ esp_err_t handler_ota_update(httpd_req_t *req) httpd_resp_send(req, zw.c_str(), strlen(zw.c_str())); httpd_resp_send_chunk(req, NULL, 0); - ESP_LOGE(TAG, "ota without parameter - should not be the case!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "ota without parameter - should not be the case!"); /* const char* resp_str; @@ -607,7 +607,7 @@ void task_reboot(void *KillAutoFlow) vTaskDelay(5000 / portTICK_PERIOD_MS); hard_restart(); // Reset type: System reset (Triggered by watchdog), if esp_restart stalls (WDT needs to be activated) - ESP_LOGE(TAG, "Reboot failed!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Reboot failed!"); vTaskDelete(NULL); //Delete this task if it comes to this point } @@ -620,7 +620,7 @@ void doReboot() BaseType_t xReturned = xTaskCreate(&task_reboot, "task_reboot", configMINIMAL_STACK_SIZE * 3, (void*) true, 10, NULL); if( xReturned != pdPASS ) { - ESP_LOGE(TAG, "task_reboot not created -> force reboot without killing flow"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "task_reboot not created -> force reboot without killing flow"); task_reboot((void*) false); } vTaskDelay(10000 / portTICK_PERIOD_MS); // Prevent serving web client fetch response until system is shuting down @@ -650,7 +650,7 @@ esp_err_t handler_reboot(httpd_req_t *req) #endif LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handler_reboot"); - ESP_LOGI(TAG, "!!! System will restart within 5 sec!!!"); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "!!! System will restart within 5 sec!!!"); std::string response = "