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

Factor out SONAR_LOG

Browse Source 
Reviewed By: passy

Differential Revision: D9555739

fbshipit-source-id: 022763ea03047e1c4cd88d5f389b66be4cbe416b
This commit is contained in:
John Knox
2018-09-03 11:10:59 -07:00
committed by Facebook Github Bot
parent 243b4207e7
commit 9939a9e3bb
5 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xplat/Sonar/SonarClient.cpp
View File

@@ -13,16 +13,9 @@
#include "SonarStep.h"
#include "SonarWebSocketImpl.h"
#include "ConnectionContextStore.h"
#include "Log.h"
#include <vector>
#ifdef __ANDROID__
#include <android/log.h>
#define SONAR_LOG(message) \
__android_log_print(ANDROID_LOG_INFO, "sonar", "sonar: %s", message)
#else
#define SONAR_LOG(message) printf("sonar: %s\n", message)
#endif
#if FB_SONARKIT_ENABLED
namespace facebook {
@@ -45,12 +38,12 @@ SonarClient* SonarClient::instance() {
void SonarClient::setStateListener(
std::shared_ptr<SonarStateUpdateListener> stateListener) {
SONAR_LOG("Setting state listener");
log("Setting state listener");
sonarState_->setUpdateListener(stateListener);
}
void SonarClient::addPlugin(std::shared_ptr<SonarPlugin> plugin) {
SONAR_LOG(("SonarClient::addPlugin " + plugin->identifier()).c_str());
log("SonarClient::addPlugin " + plugin->identifier());
auto step = sonarState_->start("Add plugin " + plugin->identifier());
std::lock_guard<std::mutex> lock(mutex_);
@@ -68,7 +61,7 @@ void SonarClient::addPlugin(std::shared_ptr<SonarPlugin> plugin) {
}
void SonarClient::removePlugin(std::shared_ptr<SonarPlugin> plugin) {
SONAR_LOG(("SonarClient::removePlugin " + plugin->identifier()).c_str());
log("SonarClient::removePlugin " + plugin->identifier());
std::lock_guard<std::mutex> lock(mutex_);
performAndReportError([this, plugin]() {
@@ -111,14 +104,14 @@ void SonarClient::refreshPlugins() {
}
void SonarClient::onConnected() {
SONAR_LOG("SonarClient::onConnected");
log("SonarClient::onConnected");
std::lock_guard<std::mutex> lock(mutex_);
connected_ = true;
}
void SonarClient::onDisconnected() {
SONAR_LOG("SonarClient::onDisconnected");
log("SonarClient::onDisconnected");
auto step = sonarState_->start("Trigger onDisconnected callbacks");
std::lock_guard<std::mutex> lock(mutex_);
connected_ = false;