jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not throw when a plugin is already added

Browse Source 
Summary:
Causes a lot of errors that don't seem to be preventable from a plugin author's perspective and also completely benign.

https://www.internalfb.com/logview/flipper_javascript/3b754533c5da4e91fe8c0a3318cf8d5c?trace_tab=latest

Reviewed By: lblasa

Differential Revision: D48642974

fbshipit-source-id: 5ba542afbaa4175e1657d4b229d8bab62fac9862
This commit is contained in:
Pascal Hartig
2023-08-25 02:14:22 -07:00
committed by Facebook GitHub Bot
parent ef6e3df9df
commit 7822099f50
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xplat/Flipper/FlipperClient.cpp
View File

@@ -59,15 +59,17 @@ void FlipperClient::addPlugin(std::shared_ptr<FlipperPlugin> plugin) {
performAndReportError([this, plugin]() { performAndReportError([this, plugin]() {
log("FlipperClient::addPlugin " + plugin->identifier()); log("FlipperClient::addPlugin " + plugin->identifier());
auto step = flipperState_->start("Add plugin " + plugin->identifier()); auto step = flipperState_->start("Add plugin " + plugin->identifier());
auto needs_refresh = false;
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
if (plugins_.find(plugin->identifier()) != plugins_.end()) { if (plugins_.find(plugin->identifier()) != plugins_.end()) {
throw std::out_of_range( log("plugin " + plugin->identifier() + " already added.");
"plugin " + plugin->identifier() + " already added."); } else {
plugins_[plugin->identifier()] = plugin;
needs_refresh = true;
} }
plugins_[plugin->identifier()] = plugin;
step->complete(); step->complete();
if (connected_) { if (connected_ && needs_refresh) {
refreshPlugins(); refreshPlugins();
} }
}); });