Cleanup code and version update

silviucpp · Jul 26, 2024 · ac3f3c7 · ac3f3c7
1 parent 35daac2
commit ac3f3c7
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,14 @@
 ### Changelog:
 
+#### 2.1.6
+
+- OAuthbearer support (contribution from macasado86 : https://github.com/silviucpp/erlkaf/pull/74)
+
 #### 2.1.5
 
-- Bug fixing: brew install causing undesired updates and crashing other Homebrew pkgs (https://github.com/silviucpp/erlkaf/issues/68)
+[- Bug fixing: brew install causing undesired updates and crashing other Homebrew pkgs (https://github.com/silviucpp/erlkaf/issues/68)
 - Update travis config
-- Bug fixing: https://github.com/silviucpp/erlkaf/pull/71
+- Bug fixing: https://github.com/silviucpp/erlkaf/pull/71]()
 
 #### 2.1.4
 

diff --git a/README.MD b/README.MD
@@ -1,5 +1,5 @@
 # erlkaf
-[![Build Status](https://travis-ci.com/silviucpp/erlkaf.svg?branch=master)](https://travis-ci.com/github/silviucpp/erlkaf)
+[![Build Status](https://app.travis-ci.com/silviucpp/erlkaf.svg?branch=master)](https://travis-ci.com/github/silviucpp/erlkaf)
 [![GitHub](https://img.shields.io/github/license/silviucpp/erlkaf)](https://github.com/silviucpp/erlkaf/blob/master/LICENSE)
 [![Hex.pm](https://img.shields.io/hexpm/v/erlkaf)](https://hex.pm/packages/erlkaf)
 

diff --git a/c_src/erlkaf_consumer.cc b/c_src/erlkaf_consumer.cc
@@ -16,8 +16,6 @@
 #include <future>
 #include <string.h>
 #include <unistd.h>
-#include <sstream>
-#include <iostream>
 
 namespace {
 
@@ -111,7 +109,7 @@ void assign_partitions(ErlNifEnv* env, enif_consumer* consumer, rd_kafka_t *rk,
         rd_kafka_assign(rk, NULL);
         return;
     }
-    
+
     rd_kafka_resp_err_t response = rd_kafka_assign(rk, partitions);
 
     if(response != RD_KAFKA_RESP_ERR_NO_ERROR)
@@ -184,7 +182,7 @@ void oauthbearer_token_refresh_callback(rd_kafka_t *rk, const char *oauthbearer_
         ERL_NIF_TERM config = make_binary(env, oauthbearer_config, strlen(oauthbearer_config));
         enif_send(NULL, &consumer->owner, env, enif_make_tuple2(env, ATOMS.atomOauthbearerTokenRefresh, config));
     }
-    
+
     enif_free_env(env);
 }
 
@@ -471,7 +469,7 @@ ERL_NIF_TERM enif_consumer_cleanup(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 ERL_NIF_TERM enif_consumer_oauthbearer_set_token(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     UNUSED(argc);
-    
+
     std::string token;
     long lifetime;
     std::string principal;

diff --git a/c_src/erlkaf_oauthbearer.cc b/c_src/erlkaf_oauthbearer.cc
@@ -6,6 +6,8 @@
 #include <sstream>
 #include <iostream>
 
+namespace {
+
 char** split_extensions(const std::string extensions_str, size_t* length)
 {
     std::stringstream extensions_stream(extensions_str);
@@ -44,6 +46,8 @@ void free_extensions(char** extensions, size_t length)
     }
 }
 
+}
+
 ERL_NIF_TERM oauthbearer_set_token(rd_kafka_t* kf, std::string token, long lifetime, std::string principal, std::string extensions_str)
 {
     char set_token_errstr[512];

diff --git a/c_src/erlkaf_producer.cc b/c_src/erlkaf_producer.cc
@@ -14,9 +14,6 @@
 #include <memory>
 #include <string>
 #include <future>
-#include <vector>
-#include <sstream>
-#include <iostream>
 
 namespace {
 

diff --git a/src/erlkaf.app.src b/src/erlkaf.app.src
@@ -2,7 +2,7 @@
     {description, "erlkaf - Erlang Kafka library based on librdkafka"},
     {licenses, ["MIT"]},
     {links,[{"Github","https://github.com/silviucpp/erlkaf"}]},
-    {vsn, "2.1.5"},
+    {vsn, "2.1.6"},
     {registered, []},
     {applications, [
         kernel,

diff --git a/src/erlkaf_producer.erl b/src/erlkaf_producer.erl
@@ -120,10 +120,10 @@ handle_info({stats, Stats0}, #state{stats_cb = StatsCb, client_id = ClientId} =
     {noreply, State#state{stats = Stats}};
 
 handle_info({oauthbearer_token_refresh, OauthBearerConfig}, #state{
-    oauthbearer_token_refresh_cb = OauthbearerTokenRefreshCb, 
-    client_id = ClientId, 
+    oauthbearer_token_refresh_cb = OauthbearerTokenRefreshCb,
+    client_id = ClientId,
     ref = ClientRef} = State) ->
-    
+
     case catch erlkaf_utils:call_oauthbearer_token_refresh_callback(OauthbearerTokenRefreshCb, OauthBearerConfig) of
         {ok, Token, LifeTime, Principal} ->
             erlkaf_nif:producer_oauthbearer_set_token(ClientRef, Token, LifeTime, Principal, "");