andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-07-31 02:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from proddy/cursor/critical-bug-investigation-ac3f

Browse Source 
Fix main-loop deadlock that breaks system/message and sendmail commands
This commit is contained in:
Proddy
2026-06-13 17:16:19 +02:00
committed by GitHub
parent 06a81db88a 5ee08443f9
commit be0737f783
4 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/web/WebCommandService.cpp
View File

@@ -141,14 +141,12 @@ bool WebCommandService::dispatchCommand(const char * name, const char * value) {
if (isUrlCommand(ci->cmd.c_str())) {
return queueCommand(name, value);
}
// system/message defers evaluation of its value (via the scheduler's raw_value),
// so executing it never blocks - keep it synchronous even if the value has a {url}
if (Helpers::toLower(ci->cmd.c_str()) != "system/message") {
// the effective value is the override if given, else the command's stored default
const std::string effective_value = value ? value : std::string(ci->value.c_str());
if (valueContainsUrl(effective_value)) {
return queueCommand(name, value);
}
// internal command whose value embeds a {url} fetch (e.g. system/message) - the value is
// resolved by compute() at execution time and would block, so offload it to the worker task
// the effective value is the override if given, else the command's stored default
const std::string effective_value = value ? value : std::string(ci->value.c_str());
if (valueContainsUrl(effective_value)) {
return queueCommand(name, value);
}
}
}
@@ -240,8 +238,8 @@ bool WebCommandService::executeCommand(const char * name, const std::string & co
// run the value through the shunting-yard calculator so expressions like "custom/heatcnt + 1"
// are resolved (entity references replaced by their values, then computed). Plain values pass
// through unchanged. Applies to both URL and internal commands, like the old scheduler code
// which computed the value before executing. system/message evaluates its own argument later
// (deferred via the scheduler's raw_value), so pre-computing it would run it twice - pass raw.
// which computed the value before executing. system/message runs the shunting-yard on its own
// argument, so pre-computing it here would run it twice - pass it through raw.
std::string computed_data = data;
if (!data.empty() && cmd != "system/message") {
computed_data = compute(data);

5
src/web/WebSchedulerService.cpp
View File

@@ -367,11 +367,6 @@ void WebSchedulerService::loop() {
static uint32_t last_uptime_min = 0;
static uint32_t last_uptime_sec = 0;
if (!raw_value.empty()) {
computed_value = compute(raw_value);
raw_value.clear();
}
if (scheduleItems_->empty()) {
return;
}

3
src/web/WebSchedulerService.h
View File

@@ -75,9 +75,6 @@ class WebSchedulerService : public StatefulService<WebScheduler> {
std::string get_metrics_prometheus();
std::string raw_value;
std::string computed_value;
#if defined(EMSESP_TEST)
void load_test_data();
#endif