Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/zm_monitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2725,6 +2725,15 @@ void Monitor::Reload() {
delete row;
} // end if row

// Load() replaced linked_monitors_string, but the expression parsed from it
// is otherwise only rebuilt by connect(), so a changed LinkedMonitors did not
// apply until the next reconnect. Analyse() reads linked_monitors under
// event_mutex.
{
std::lock_guard<std::mutex> lck(event_mutex);
ReloadLinkedMonitors();
}

// Actions are otherwise only read during setup, so an action added or edited
// in the web UI would not fire until the monitor's daemon was restarted.
// Zones are already re-read by Load() above; actions have the same lifetime.
Expand Down