jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-29 06:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[preferences] Shorten log messages (#8982)

Browse Source
This commit is contained in:
Keith Burzinski 2025-05-31 14:23:47 -05:00 committed by GitHub
parent 9ba9674437
commit 5771bb4907
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/esp32/preferences.cpp
View File

@ -111,7 +111,7 @@ class ESP32Preferences : public ESPPreferences {
if (s_pending_save.empty()) if (s_pending_save.empty())
return true; return true;
ESP_LOGD(TAG, "Saving %d preferences to flash...", s_pending_save.size()); ESP_LOGV(TAG, "Saving %d items...", s_pending_save.size());
// goal try write all pending saves even if one fails // goal try write all pending saves even if one fails
int cached = 0, written = 0, failed = 0; int cached = 0, written = 0, failed = 0;
esp_err_t last_err = ESP_OK; esp_err_t last_err = ESP_OK;
@ -139,10 +139,10 @@ class ESP32Preferences : public ESPPreferences {
} }
s_pending_save.erase(s_pending_save.begin() + i); s_pending_save.erase(s_pending_save.begin() + i);
} }
ESP_LOGD(TAG, "Saving %d preferences to flash: %d cached, %d written, %d failed", cached + written + failed, cached, ESP_LOGD(TAG, "Writing %d items: %d cached, %d written, %d failed", cached + written + failed, cached, written,
written, failed); failed);
if (failed > 0) { if (failed > 0) {
ESP_LOGE(TAG, "Error saving %d preferences to flash. Last error=%s for key=%s", failed, esp_err_to_name(last_err), ESP_LOGE(TAG, "Writing %d items failed. Last error=%s for key=%s", failed, esp_err_to_name(last_err),
last_key.c_str()); last_key.c_str());
} }
@ -173,7 +173,7 @@ class ESP32Preferences : public ESPPreferences {
} }
bool reset() override { bool reset() override {
ESP_LOGD(TAG, "Cleaning up preferences in flash..."); ESP_LOGD(TAG, "Erasing storage");
s_pending_save.clear(); s_pending_save.clear();
nvs_flash_deinit(); nvs_flash_deinit();

10
esphome/components/esp8266/preferences.cpp
View File

@ -235,7 +235,7 @@ class ESP8266Preferences : public ESPPreferences {
if (s_prevent_write) if (s_prevent_write)
return false; return false;
ESP_LOGD(TAG, "Saving preferences to flash..."); ESP_LOGD(TAG, "Saving");
SpiFlashOpResult erase_res, write_res = SPI_FLASH_RESULT_OK; SpiFlashOpResult erase_res, write_res = SPI_FLASH_RESULT_OK;
{ {
InterruptLock lock; InterruptLock lock;
@ -245,11 +245,11 @@ class ESP8266Preferences : public ESPPreferences {
} }
} }
if (erase_res != SPI_FLASH_RESULT_OK) { if (erase_res != SPI_FLASH_RESULT_OK) {
ESP_LOGE(TAG, "Erase ESP8266 flash failed!"); ESP_LOGE(TAG, "Erasing failed");
return false; return false;
} }
if (write_res != SPI_FLASH_RESULT_OK) { if (write_res != SPI_FLASH_RESULT_OK) {
ESP_LOGE(TAG, "Write ESP8266 flash failed!"); ESP_LOGE(TAG, "Writing failed");
return false; return false;
} }
@ -258,14 +258,14 @@ class ESP8266Preferences : public ESPPreferences {
} }
bool reset() override { bool reset() override {
ESP_LOGD(TAG, "Cleaning up preferences in flash..."); ESP_LOGD(TAG, "Erasing storage");
SpiFlashOpResult erase_res; SpiFlashOpResult erase_res;
{ {
InterruptLock lock; InterruptLock lock;
erase_res = spi_flash_erase_sector(get_esp8266_flash_sector()); erase_res = spi_flash_erase_sector(get_esp8266_flash_sector());
} }
if (erase_res != SPI_FLASH_RESULT_OK) { if (erase_res != SPI_FLASH_RESULT_OK) {
ESP_LOGE(TAG, "Erase ESP8266 flash failed!"); ESP_LOGE(TAG, "Erasing failed");
return false; return false;
} }

11
esphome/components/libretiny/preferences.cpp
View File

@ -101,7 +101,7 @@ class LibreTinyPreferences : public ESPPreferences {
if (s_pending_save.empty()) if (s_pending_save.empty())
return true; return true;
ESP_LOGD(TAG, "Saving %d preferences to flash...", s_pending_save.size()); ESP_LOGV(TAG, "Saving %d items...", s_pending_save.size());
// goal try write all pending saves even if one fails // goal try write all pending saves even if one fails
int cached = 0, written = 0, failed = 0; int cached = 0, written = 0, failed = 0;
fdb_err_t last_err = FDB_NO_ERR; fdb_err_t last_err = FDB_NO_ERR;
@ -129,11 +129,10 @@ class LibreTinyPreferences : public ESPPreferences {
} }
s_pending_save.erase(s_pending_save.begin() + i); s_pending_save.erase(s_pending_save.begin() + i);
} }
ESP_LOGD(TAG, "Saving %d preferences to flash: %d cached, %d written, %d failed", cached + written + failed, cached, ESP_LOGD(TAG, "Writing %d items: %d cached, %d written, %d failed", cached + written + failed, cached, written,
written, failed); failed);
if (failed > 0) { if (failed > 0) {
ESP_LOGE(TAG, "Error saving %d preferences to flash. Last error=%d for key=%s", failed, last_err, ESP_LOGE(TAG, "Writing %d items failed. Last error=%d for key=%s", failed, last_err, last_key.c_str());
last_key.c_str());
} }
return failed == 0; return failed == 0;
@ -158,7 +157,7 @@ class LibreTinyPreferences : public ESPPreferences {
} }
bool reset() override { bool reset() override {
ESP_LOGD(TAG, "Cleaning up preferences in flash..."); ESP_LOGD(TAG, "Erasing storage");
s_pending_save.clear(); s_pending_save.clear();
fdb_kv_set_default(&db); fdb_kv_set_default(&db);

4
esphome/components/rp2040/preferences.cpp
View File

@ -114,7 +114,7 @@ class RP2040Preferences : public ESPPreferences {
if (s_prevent_write) if (s_prevent_write)
return false; return false;
ESP_LOGD(TAG, "Saving preferences to flash..."); ESP_LOGD(TAG, "Saving");
{ {
InterruptLock lock; InterruptLock lock;
@ -129,7 +129,7 @@ class RP2040Preferences : public ESPPreferences {
} }
bool reset() override { bool reset() override {
ESP_LOGD(TAG, "Cleaning up preferences in flash..."); ESP_LOGD(TAG, "Erasing storage");
{ {
InterruptLock lock; InterruptLock lock;
::rp2040.idleOtherCore(); ::rp2040.idleOtherCore();