void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-08-02 23:12:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

call DB::eraseNetwork when it should be

Browse source 
One of those i'm not sure how this ever worked situations
This commit is contained in:
Grant Limberg 2025-07-16 09:05:54 -07:00
parent 4edeacd1f0
commit 51b2f284f0
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controller/DB.cpp
View file

@ -456,6 +456,9 @@ void DB::_networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, boo
auto provider = opentelemetry::trace::Provider::GetTracerProvider(); auto provider = opentelemetry::trace::Provider::GetTracerProvider();
auto tracer = provider->GetTracer("db"); auto tracer = provider->GetTracer("db");
auto span = tracer->StartSpan("db::_networkChanged"); auto span = tracer->StartSpan("db::_networkChanged");
span->SetAttribute("old_network_config", old.dump());
span->SetAttribute("network_config", networkConfig.dump());
span->SetAttribute("notify_listeners", notifyListeners);
auto scope = tracer->WithActiveSpan(span); auto scope = tracer->WithActiveSpan(span);
Metrics::db_network_change++; Metrics::db_network_change++;
@ -517,6 +520,8 @@ void DB::_networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, boo
std::cerr << "Error deauthorizing members on network delete: " << e.what() << std::endl; std::cerr << "Error deauthorizing members on network delete: " << e.what() << std::endl;
} }
this->eraseNetwork(networkId);
// delete the network // delete the network
std::unique_lock<std::shared_mutex> l(_networks_l); std::unique_lock<std::shared_mutex> l(_networks_l);
_networks.erase(networkId); _networks.erase(networkId);