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

Revert D9117507: [flipper] Pass SonarState into SonarWebSocketImpl

Browse Source 
Differential Revision:
D9117507

Original commit changeset: 24eeb1f80109

fbshipit-source-id: 9668d3880bc1048c542d78c7a522c6ed1ecd4037
This commit is contained in:
Daniel Abramowitz
2018-08-03 08:18:16 -07:00
committed by Facebook Github Bot
parent 0e4957b856
commit 7fc7061fca
5 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xplat/Sonar/SonarClient.h
View File

@@ -39,8 +39,9 @@ class SonarClient : public SonarWebSocket::Callbacks {
/**
Only public for testing
*/
SonarClient(std::unique_ptr<SonarWebSocket> socket, std::shared_ptr<SonarState> state)
: socket_(std::move(socket)), sonarState_(state) {
SonarClient(std::unique_ptr<SonarWebSocket> socket)
: socket_(std::move(socket)) {
sonarState_ = std::make_unique<SonarState>();
auto step = sonarState_->start("Create client");
socket_->setCallbacks(this);
step->complete();
@@ -91,7 +92,7 @@ class SonarClient : public SonarWebSocket::Callbacks {
std::map<std::string, std::shared_ptr<SonarPlugin>> plugins_;
std::map<std::string, std::shared_ptr<SonarConnectionImpl>> connections_;
std::mutex mutex_;
std::shared_ptr<SonarState> sonarState_;
std::unique_ptr<SonarState> sonarState_;
void performAndReportError(const std::function<void()>& func);
void disconnect(std::shared_ptr<SonarPlugin> plugin);