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

16
xplat/Sonar/ConnectionContextStore.cpp
View File

@@ -1,18 +1,11 @@
#include "ConnectionContextStore.h"
#include "CertificateUtils.h"
#include "Log.h"
#include <sys/stat.h>
#include <iostream>
#include <fstream>
#include <folly/json.h>
#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
using namespace facebook::sonar;
static constexpr auto CSR_FILE_NAME = "app.csr";
@@ -98,9 +91,7 @@ bool ConnectionContextStore::ensureSonarDirExists() {
} else if (info.st_mode & S_IFDIR) {
return true;
} else {
SONAR_LOG(std::string(
"ERROR: Sonar path exists but is not a directory: " + dirPath)
.c_str());
log("ERROR: Sonar path exists but is not a directory: " + dirPath);
return false;
}
}
@@ -114,8 +105,7 @@ std::string loadStringFromFile(std::string fileName) {
std::string line;
stream.open(fileName.c_str());
if (!stream) {
SONAR_LOG(
std::string("ERROR: Unable to open ifstream: " + fileName).c_str());
log("ERROR: Unable to open ifstream: " + fileName);
return "";
}
buffer << stream.rdbuf();