clang-format

Author: david-antiteum

.clang-format

@@ -0,0 +1,32 @@
+---
+BasedOnStyle: WebKit
+AlignConsecutiveMacros: true
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterClass: true
+  AfterFunction: true
+  AfterStruct: true
+  AfterNamespace: false
+BreakConstructorInitializers: BeforeComma
+CompactNamespaces: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+PointerAlignment: Middle
+SortIncludes: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeParens: Never
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInParentheses: true
+SpacesInSquareBrackets: true
+Standard: Cpp11
+TabWidth: '4'
+UseTab: Always
+
+...

examples/leader/main.cpp

@@ -20,7 +20,7 @@ DISABLE_WARNING_POP
 
 class HealthServiceImpl final : public grpc::health::v1::Health::Service
 {
-	grpc::Status Check( grpc::ServerContext* context, const grpc::health::v1::HealthCheckRequest * request, grpc::health::v1::HealthCheckResponse * reply ) override
+	grpc::Status Check( grpc::ServerContext * context, const grpc::health::v1::HealthCheckRequest * request, grpc::health::v1::HealthCheckResponse * reply ) override
 	{
 		reply->set_status( grpc::health::v1::HealthCheckResponse_ServingStatus_SERVING );
 		spdlog::info( "HealthServiceImpl Check called" );
@@ -32,78 +32,78 @@ static std::unique_ptr<grpc::Server> gServer;
 
 void RunServer( const consulcpp::Service & service )
 {
-	std::string 		serverAddress = fmt::format( "{}:{}", service.mAddress, service.mPort );
-	HealthServiceImpl 	healthService;
+	std::string			serverAddress = fmt::format( "{}:{}", service.mAddress, service.mPort );
+	HealthServiceImpl	healthService;
 	grpc::ServerBuilder builder;
 
 	builder.AddListeningPort( serverAddress, grpc::InsecureServerCredentials() );
 	builder.RegisterService( &healthService );
 
 	gServer = builder.BuildAndStart();
-	if( gServer ){
+	if( gServer ) {
 		spdlog::info( "Server listening on {}", serverAddress );
 		gServer->Wait();
 		spdlog::info( "Server stopped" );
-	}else{
+	} else {
 		spdlog::critical( "Cannot start gRPC server on {}", serverAddress );
 	}
 }
 
 int main( int argc, char * argv[] )
 {
-	consulcpp::Consul		consul;
-	
-	if( consul.connect() ){
+	consulcpp::Consul consul;
+
+	if( consul.connect() ) {
 		spdlog::info( "Agent address {}", consul.address() );
 
-		consulcpp::Service			service;
-		consulcpp::ServiceCheck		check;
+		consulcpp::Service		service;
+		consulcpp::ServiceCheck check;
 
-		service.mId = fmt::format( "{}", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count() );
-		service.mName = "leader-demo";
+		service.mId		 = fmt::format( "{}", std::chrono::duration_cast<std::chrono::milliseconds>( std::chrono::system_clock::now().time_since_epoch() ).count() );
+		service.mName	 = "leader-demo";
 		service.mAddress = consul.address();
-		if( argc > 1 ){
-			service.mPort = std::stoi( argv[1] );
-		}else{
+		if( argc > 1 ) {
+			service.mPort = std::stoi( argv[ 1 ] );
+		} else {
 			service.mPort = 50051;
 		}
-		check.mInterval = "5s";
+		check.mInterval						  = "5s";
 		check.mDeregisterCriticalServiceAfter = "1m";
-		check.mGRPC = fmt::format( "{}:{}/Health", service.mAddress, service.mPort );
-		service.mChecks = { check };
+		check.mGRPC							  = fmt::format( "{}:{}/Health", service.mAddress, service.mPort );
+		service.mChecks						  = { check };
 
 		// Purge death services
-		std::vector<consulcpp::Service>	otherServices = consul.services().findInCatalog( service.mName, service.mTags );
-		for( auto service: otherServices ){
+		std::vector<consulcpp::Service> otherServices = consul.services().findInCatalog( service.mName, service.mTags );
+		for( auto service: otherServices ) {
 			consul.services().destroy( service );
 		}
 
 		consul.services().create( service );
-		consulcpp::Session 	session = consul.sessions().create();
+		consulcpp::Session session = consul.sessions().create();
 		spdlog::info( "Session {}", session.mId );
 
 		consul.kv().set( "my-key", "my-value" );
 
 		consulcpp::Leader::Status leader = consul.leader().acquire( service, session );
-		if( leader == consulcpp::Leader::Status::Yes ){
+		if( leader == consulcpp::Leader::Status::Yes ) {
 			spdlog::info( "I'm the leader" );
-		}else{
+		} else {
 			spdlog::info( "I'm a follower" );
 		}
 		std::thread grpcThread( RunServer, service );
 		loop();
-		if( gServer ){
+		if( gServer ) {
 			gServer->Shutdown();
 		}
 		grpcThread.join();
-		
+
 		auto val = consul.kv().get( "my-key" );
-		if( val ){
+		if( val ) {
 			spdlog::info( "Key value was {}", val.value() );
-			if( consul.kv().destroy( "my-key" ) ){
+			if( consul.kv().destroy( "my-key" ) ) {
 				spdlog::info( "Key deleted" );
 			}
-		}else{
+		} else {
 			spdlog::info( "Key not found" );
 		}
 		consul.leader().release( service, session );

src/Consul.cpp

@@ -11,36 +11,36 @@
 
 struct consulcpp::Consul::Private
 {
-	std::string 	mAgentAddress;
-	std::string 	mAgentAPIVersion = "v1";
-	std::string		mAddress;
-	Services		mServices;
-	Sessions		mSessions;
-	Leader			mLeader;
-	KV				mKV;
+	std::string mAgentAddress;
+	std::string mAgentAPIVersion = "v1";
+	std::string mAddress;
+	Services	mServices;
+	Sessions	mSessions;
+	Leader		mLeader;
+	KV			mKV;
 
 	Private( Consul & consul, const std::string & agentAddress )
 		: mServices( consul )
 		, mSessions( consul )
 		, mLeader( consul )
 		, mKV( consul )
 	{
-		if( agentAddress.empty() ){
+		if( agentAddress.empty() ) {
 			mAgentAddress = "http://127.0.0.1:8500";
-		}else{
+		} else {
 			mAgentAddress = agentAddress;
 		}
 	}
 };
 
-consulcpp::Consul::Consul() : d( std::make_unique<Private>( *this, std::string() ) )
+consulcpp::Consul::Consul()
+	: d( std::make_unique<Private>( *this, std::string() ) )
 {
-
 }
 
-consulcpp::Consul::Consul( const std::string & agentAddress ) : d( std::make_unique<Private>( *this, agentAddress ) )
+consulcpp::Consul::Consul( const std::string & agentAddress )
+	: d( std::make_unique<Private>( *this, agentAddress ) )
 {
-
 }
 
 consulcpp::Consul::~Consul()
@@ -50,12 +50,12 @@ consulcpp::Consul::~Consul()
 bool consulcpp::Consul::connect()
 {
 	auto response = consulcpp::internal::HttpClient::get( fmt::format( "{}/{}/agent/self", d->mAgentAddress, d->mAgentAPIVersion ) );
-	if( response ){
+	if( response ) {
 		auto jsonValue = nlohmann::json::parse( response.value() );
-		try{
+		try {
 			auto memberJson = jsonValue.at( "Member" );
-			d->mAddress = memberJson.at( "Addr" ).get<std::string>();
-		}catch( const std::exception & e ){
+			d->mAddress		= memberJson.at( "Addr" ).get<std::string>();
+		} catch( const std::exception & e ) {
 			spdlog::error( "{}. Json was: {}", e.what(), jsonValue.dump() );
 		}
 	}

src/KV.cpp

@@ -9,17 +9,17 @@
 
 struct consulcpp::KV::Private
 {
-	consulcpp::Consul		& mConsul;
+	consulcpp::Consul & mConsul;
 
 	Private( Consul & consul )
 		: mConsul( consul )
 	{
 	}
 };
 
-consulcpp::KV::KV( Consul & consul ) : d( std::make_unique<Private>( consul ) )
+consulcpp::KV::KV( Consul & consul )
+	: d( std::make_unique<Private>( consul ) )
 {
-
 }
 
 consulcpp::KV::~KV()
@@ -28,24 +28,24 @@ consulcpp::KV::~KV()
 
 stdx::optional<std::string> consulcpp::KV::get( const std::string & key ) const
 {
-	stdx::optional<std::string>			res;
+	stdx::optional<std::string> res;
 
 	auto response = consulcpp::internal::HttpClient::get( fmt::format( "{}/{}/kv/{}", d->mConsul.agentAddress(), d->mConsul.agentAPIVersion(), key ) );
-	if( response && !response.value().empty() ){
-		spdlog::info("GET VALUE {}", response.value());
+	if( response && !response.value().empty() ) {
+		spdlog::info( "GET VALUE {}", response.value() );
 		auto jsonValue = nlohmann::json::parse( response.value() );
 
-		if( jsonValue.is_array() ){
-			std::string 	value;
-			try{
-				value = jsonValue[0].at( "Value" ).get<std::string>();
-			}catch( const std::exception & e ){
+		if( jsonValue.is_array() ) {
+			std::string value;
+			try {
+				value = jsonValue[ 0 ].at( "Value" ).get<std::string>();
+			} catch( const std::exception & e ) {
 				spdlog::error( "{}. Json was: {}", e.what(), response.value() );
 			}
-			if( !value.empty() ){
-				gsl::owner<char*> out = new char[value.size()];
-				auto info = boost::beast::detail::base64::decode( out, value.c_str(), value.size() );
-				res = std::string( out, info.first );
+			if( !value.empty() ) {
+				gsl::owner<char *> out	= new char[ value.size() ];
+				auto			   info = boost::beast::detail::base64::decode( out, value.c_str(), value.size() );
+				res						= std::string( out, info.first );
 			}
 		}
 	}
@@ -54,29 +54,29 @@ stdx::optional<std::string> consulcpp::KV::get( const std::string & key ) const
 
 bool consulcpp::KV::set( const std::string & key, const std::string & value ) const
 {
-	bool		res = false;
+	bool res = false;
 
 	auto response = consulcpp::internal::HttpClient::put( fmt::format( "{}/{}/kv/{}", d->mConsul.agentAddress(), d->mConsul.agentAPIVersion(), key ), value );
-	if( response ){
-		if( response.value().find( "true" ) != std::string::npos ){
+	if( response ) {
+		if( response.value().find( "true" ) != std::string::npos ) {
 			res = true;
 		}
-	}else{
-		spdlog::error( "KV set: Consul returns the error {}", response.error());
+	} else {
+		spdlog::error( "KV set: Consul returns the error {}", response.error() );
 	}
 	return res;
 }
 
 bool consulcpp::KV::destroy( const std::string & key ) const
 {
-	bool		res = false;
+	bool res = false;
 
 	auto response = consulcpp::internal::HttpClient::delete_( fmt::format( "{}/{}/kv/{}", d->mConsul.agentAddress(), d->mConsul.agentAPIVersion(), key ) );
-	if( response ){
-		if( response.value().find( "true" ) != std::string::npos ){
+	if( response ) {
+		if( response.value().find( "true" ) != std::string::npos ) {
 			res = true;
 		}
-	}else{
+	} else {
 		spdlog::error( "KV delete: Consul returns the error {}", response.error() );
 	}
 	return res;

src/Leader.cpp

@@ -9,17 +9,17 @@
 
 struct consulcpp::Leader::Private
 {
-	consulcpp::Consul		& mConsul;
+	consulcpp::Consul & mConsul;
 
 	Private( Consul & consul )
 		: mConsul( consul )
 	{
 	}
 };
 
-consulcpp::Leader::Leader( Consul & consul ) : d( std::make_unique<Private>( consul ) )
+consulcpp::Leader::Leader( Consul & consul )
+	: d( std::make_unique<Private>( consul ) )
 {
-
 }
 
 consulcpp::Leader::~Leader()
@@ -28,32 +28,32 @@ consulcpp::Leader::~Leader()
 
 consulcpp::Leader::Status consulcpp::Leader::acquire( const Service & service, const Session & session ) const
 {
-	Leader::Status		res = Status::Error;
-	std::string			query = fmt::format( "{}/{}/kv/service/{}/leader?acquire={}", d->mConsul.agentAddress(), d->mConsul.agentAPIVersion(), service.mName, session.mId );
+	Leader::Status res	 = Status::Error;
+	std::string	   query = fmt::format( "{}/{}/kv/service/{}/leader?acquire={}", d->mConsul.agentAddress(), d->mConsul.agentAPIVersion(), service.mName, session.mId );
 
 	auto response = consulcpp::internal::HttpClient::put( query );
-	if( response ){
-		if( response.value().find( "true" ) != std::string::npos ){
+	if( response ) {
+		if( response.value().find( "true" ) != std::string::npos ) {
 			res = Status::Yes;
-		}else if( response.value().find( "false" ) != std::string::npos ){
+		} else if( response.value().find( "false" ) != std::string::npos ) {
 			res = Status::No;
 		}
-	}else{
+	} else {
 		spdlog::error( "Leader acquire: Consul returns the error {}", response.error() );
 	}
 	return res;
 }
 
 void consulcpp::Leader::release( const Service & service, const Session & session ) const
 {
-	std::string			query = fmt::format( "{}/{}/kv/service/{}/leader?release={}", d->mConsul.agentAddress(), d->mConsul.agentAPIVersion(), service.mName, session.mId );
+	std::string query = fmt::format( "{}/{}/kv/service/{}/leader?release={}", d->mConsul.agentAddress(), d->mConsul.agentAPIVersion(), service.mName, session.mId );
 
 	auto response = consulcpp::internal::HttpClient::put( query );
-	if( response ){
-		if( response.value().find( "true" ) == std::string::npos ){
+	if( response ) {
+		if( response.value().find( "true" ) == std::string::npos ) {
 			spdlog::warn( "Leader release: release fails. Value was not acquire by this service?" );
 		}
-	}else{
+	} else {
 		spdlog::error( "Leader release: Consul returns the error {}", response.error() );
 	}
 }