Skip to content

Commit

Permalink
Showing 4 changed files with 13 additions and 14 deletions.
3 changes: 1 addition & 2 deletions pulsar-client-cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -110,7 +110,7 @@ else()
endif (USE_LOG4CXX)
endif (LINK_STATIC)

find_package(Boost REQUIRED COMPONENTS program_options filesystem regex system)
find_package(Boost REQUIRED COMPONENTS program_options regex system)

if (BUILD_PYTHON_WRAPPER)
find_package(PythonLibs REQUIRED)
@@ -208,7 +208,6 @@ include_directories(
set(COMMON_LIBS
${COMMON_LIBS} -lpthread -lm
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_REGEX_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${CURL_LIBRARY_PATH}
14 changes: 8 additions & 6 deletions pulsar-client-cpp/lib/ClientConnection.cc
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@
#include <algorithm>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/gregorian/gregorian.hpp>
#include <boost/filesystem.hpp>
#include <climits>

#include "ExecutorService.h"
@@ -116,6 +115,11 @@ static Result getResult(ServerError serverError) {
return ResultUnknownError;
}

static bool file_exists(const std::string& path) {
std::ifstream f(path);
return !f.bad();
}

ClientConnection::ClientConnection(const std::string& logicalAddress, const std::string& physicalAddress,
ExecutorServicePtr executor,
const ClientConfiguration& clientConfiguration,
@@ -144,8 +148,6 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
numOfPendingLookupRequest_(0),
isTlsAllowInsecureConnection_(false) {
if (clientConfiguration.isUseTls()) {
using namespace boost::filesystem;

#if BOOST_VERSION >= 105400
boost::asio::ssl::context ctx(boost::asio::ssl::context::tlsv12_client);
#else
@@ -157,7 +159,7 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
} else {
ctx.set_verify_mode(boost::asio::ssl::context::verify_peer);
std::string trustCertFilePath = clientConfiguration.getTlsTrustCertsFilePath();
if (exists(path(trustCertFilePath))) {
if (file_exists(trustCertFilePath)) {
ctx.load_verify_file(trustCertFilePath);
} else {
LOG_ERROR(trustCertFilePath << ": No such trustCertFile");
@@ -177,15 +179,15 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
std::string tlsCertificates = authData->getTlsCertificates();
std::string tlsPrivateKey = authData->getTlsPrivateKey();

if (exists(path(tlsCertificates))) {
if (file_exists(tlsCertificates)) {
ctx.use_certificate_file(tlsCertificates, boost::asio::ssl::context::pem);
} else {
LOG_ERROR(tlsCertificates << ": No such tlsCertificates");
close();
return;
}

if (exists(path(tlsPrivateKey))) {
if (file_exists(tlsPrivateKey)) {
ctx.use_private_key_file(tlsPrivateKey, boost::asio::ssl::context::pem);
} else {
LOG_ERROR(tlsPrivateKey << ": No such tlsPrivateKey");
5 changes: 2 additions & 3 deletions pulsar-client-cpp/perf/PerfConsumer.cc
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@ DECLARE_LOG_OBJECT()
using namespace std::chrono;

#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/filesystem.hpp>
#include <boost/program_options.hpp>
#include <boost/accumulators/accumulators.hpp>
#include <boost/accumulators/statistics/stats.hpp>
@@ -242,13 +241,13 @@ int main(int argc, char** argv) {
const std::string confFile = "conf/client.conf";
std::string defaultServiceUrl;

if (boost::filesystem::exists(confFile)) {
std::ifstream file(confFile.c_str());
if (file) {
po::variables_map vm;
po::options_description confFileDesc;
confFileDesc.add_options() //
("serviceURL", po::value<std::string>()->default_value("pulsar://localhost:6650"));

std::ifstream file(confFile.c_str());
po::store(po::parse_config_file<char>(file, confFileDesc, true), vm);
po::notify(vm);

5 changes: 2 additions & 3 deletions pulsar-client-cpp/perf/PerfProducer.cc
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
DECLARE_LOG_OBJECT()

#include <mutex>
#include <boost/filesystem.hpp>

#include <boost/accumulators/accumulators.hpp>
#include <boost/accumulators/statistics/stats.hpp>
@@ -197,13 +196,13 @@ int main(int argc, char** argv) {
// First try to read default values from config file if present
const std::string confFile = "conf/client.conf";

if (boost::filesystem::exists(confFile)) {
std::ifstream file(confFile.c_str());
if (file) {
po::variables_map vm;
po::options_description confFileDesc;
confFileDesc.add_options() //
("serviceURL", po::value<std::string>()->default_value("pulsar://localhost:6650"));

std::ifstream file(confFile.c_str());
po::store(po::parse_config_file<char>(file, confFileDesc, true), vm);
po::notify(vm);

0 comments on commit a5b17f5

Please sign in to comment.