From 800302b433cd759a2a37ffb8ee017afccc08aa49 Mon Sep 17 00:00:00 2001
From: John Knox <jknox@fb.com>
Date: Fri, 10 Aug 2018 09:04:34 -0700
Subject: [PATCH] Call onDisconnect callbacks when disconnected

Summary: I noticed from the diagnostics screen that onDisconnected was never being called when sonar disconnects.

Reviewed By: danielbuechele

Differential Revision: D9265562

fbshipit-source-id: afd070126c6ef02a98c8dbc6589b6f9b8b83a730
---
 xplat/Sonar/SonarClient.cpp        | 2 +-
 xplat/Sonar/SonarWebSocketImpl.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xplat/Sonar/SonarClient.cpp b/xplat/Sonar/SonarClient.cpp
index d86beeea3..f9d1db84a 100644
--- a/xplat/Sonar/SonarClient.cpp
+++ b/xplat/Sonar/SonarClient.cpp
@@ -118,7 +118,7 @@ void SonarClient::onConnected() {
 
 void SonarClient::onDisconnected() {
   SONAR_LOG("SonarClient::onDisconnected");
-  auto step = sonarState_->start("onDisconnected callbacks");
+  auto step = sonarState_->start("Trigger onDisconnected callbacks");
   std::lock_guard<std::mutex> lock(mutex_);
   connected_ = false;
   performAndReportError([this, step]() {
diff --git a/xplat/Sonar/SonarWebSocketImpl.cpp b/xplat/Sonar/SonarWebSocketImpl.cpp
index b6d295e56..618c93e49 100644
--- a/xplat/Sonar/SonarWebSocketImpl.cpp
+++ b/xplat/Sonar/SonarWebSocketImpl.cpp
@@ -64,8 +64,8 @@ class ConnectionEvents : public rsocket::RSocketConnectionEvents {
     if (!websocket_->isOpen_)
       return;
     websocket_->isOpen_ = false;
-    websocket_->connectionIsTrusted_ = false;
     if (websocket_->connectionIsTrusted_) {
+      websocket_->connectionIsTrusted_ = false;
       websocket_->callbacks_->onDisconnected();
     }
     websocket_->reconnect();