diff --git a/xplat/Sonar/SonarClient.cpp b/xplat/Sonar/SonarClient.cpp index 9ac2fe9ca..2040f9ab9 100644 --- a/xplat/Sonar/SonarClient.cpp +++ b/xplat/Sonar/SonarClient.cpp @@ -47,16 +47,14 @@ void SonarClient::setStateListener( void SonarClient::addPlugin(std::shared_ptr plugin) { SONAR_LOG(("SonarClient::addPlugin " + plugin->identifier()).c_str()); - auto step = sonarState_->start("Add plugin " + plugin->identifier()); std::lock_guard lock(mutex_); - performAndReportError([this, plugin, step]() { + performAndReportError([this, plugin]() { if (plugins_.find(plugin->identifier()) != plugins_.end()) { throw std::out_of_range( "plugin " + plugin->identifier() + " already added."); } plugins_[plugin->identifier()] = plugin; - step->complete(); if (connected_) { refreshPlugins(); } @@ -109,22 +107,19 @@ void SonarClient::refreshPlugins() { void SonarClient::onConnected() { SONAR_LOG("SonarClient::onConnected"); - auto step = sonarState_->start("Connect"); std::lock_guard lock(mutex_); connected_ = true; - step->complete(); } void SonarClient::onDisconnected() { SONAR_LOG("SonarClient::onDisconnected"); - auto step = sonarState_->start("onDisconnected callbacks"); + std::lock_guard lock(mutex_); connected_ = false; - performAndReportError([this, step]() { + performAndReportError([this]() { for (const auto& iter : plugins_) { disconnect(iter.second); } - step->complete(); }); } diff --git a/xplat/Sonar/SonarClient.h b/xplat/Sonar/SonarClient.h index 49f90b688..d569ab3ff 100644 --- a/xplat/Sonar/SonarClient.h +++ b/xplat/Sonar/SonarClient.h @@ -42,21 +42,15 @@ class SonarClient : public SonarWebSocket::Callbacks { SonarClient(std::unique_ptr socket) : socket_(std::move(socket)) { sonarState_ = std::make_unique(); - auto step = sonarState_->start("Create client"); socket_->setCallbacks(this); - step->complete(); } void start() { - auto step = sonarState_->start("Start client"); socket_->start(); - step->complete(); } void stop() { - auto step = sonarState_->start("Stop client"); socket_->stop(); - step->complete(); } void onConnected() override;