Pulsar cpp v3.4.2

.travis.yml

@@ -8,11 +8,13 @@ rvm:
 install:
   - sudo apt-get -y install apt-utils automake
   # - sudo apt-get upgrade libstdc++6
-  - wget https://archive.apache.org/dist/pulsar/pulsar-2.6.1/DEB/apache-pulsar-client.deb
-  - wget https://archive.apache.org/dist/pulsar/pulsar-2.6.1/DEB/apache-pulsar-client-dev.deb
+  # - wget https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.4.2/deb-x86_64/apache-pulsar-client.deb
+  # - wget https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.4.2/deb-x86_64/apache-pulsar-client-dev.deb
+  - wget https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.4.2/deb-arm64/apache-pulsar-client.deb
+  - wget https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.4.2/deb-arm64/apache-pulsar-client-dev.deb
   - sudo apt-get -y install ./apache-pulsar-client.deb
   - sudo apt-get -y install ./apache-pulsar-client-dev.deb
-  - gem install bundler -v 1.16.1
+  - gem install bundler -v 2.1.4
   - bundle install
 before_script:
   - docker run --name pulsar -d -p 6650:6650 -p 8080:8080 apachepulsar/pulsar:latest bin/pulsar standalone

ext/bindings/client.cpp

@@ -1,6 +1,9 @@
 #include "rice/Data_Type.hpp"
 #include "rice/Constructor.hpp"
 #include <pulsar/Client.h>
+#include <pulsar/Logger.h>
+#include <pulsar/FileLoggerFactory.h>
+#include <pulsar/ConsoleLoggerFactory.h>
 #include <ruby/thread.h>
 
 #include "client.hpp"
@@ -54,11 +57,50 @@ void ClientConfiguration::setConcurrentLookupRequest(int n) {
 }
 
 std::string ClientConfiguration::getLogConfFilePath() {
-  return _config.getLogConfFilePath();
+  return logConfigFilePath;
 }
 
 void ClientConfiguration::setLogConfFilePath(const std::string& path) {
-  _config.setLogConfFilePath(path);
+  logConfigFilePath = path;
+
+  Logger::Level level = Logger::LEVEL_INFO;
+  if (logLevel == "DEBUG") {
+    level = Logger::LEVEL_DEBUG;
+  } else if (logLevel == "WARN") {
+    level = Logger::LEVEL_WARN;
+
+  } else if (logLevel == "ERROR") {
+    level = Logger::LEVEL_ERROR;
+  }
+  if (logConfigFilePath == "STDOUT") {
+    _config.setLogger(new ConsoleLoggerFactory(level));
+  } else {
+    _config.setLogger(new FileLoggerFactory(level, logConfigFilePath));
+  }
+}
+
+void ClientConfiguration::setLogLevel(const std::string& log_level) {
+  logLevel = log_level;
+
+  Logger::Level level = Logger::LEVEL_INFO;
+  if (logLevel == "DEBUG") {
+    level = Logger::LEVEL_DEBUG;
+  } else if (logLevel == "WARN") {
+    level = Logger::LEVEL_WARN;
+
+  } else if (logLevel == "ERROR") {
+    level = Logger::LEVEL_ERROR;
+  }
+
+  if (logConfigFilePath == "STDOUT") {
+    _config.setLogger(new ConsoleLoggerFactory(level));
+  } else {
+    _config.setLogger(new FileLoggerFactory(level, logConfigFilePath));
+  }
+}
+
+std::string ClientConfiguration::getLogLevel() {
+  return logLevel;
 }
 
 void ClientConfiguration::setSilentLogging(bool enable) {
@@ -68,7 +110,6 @@ void ClientConfiguration::setSilentLogging(bool enable) {
       throw Rice::Exception(rb_eArgError, "silent_logging can only be set once");
     }
   }
-
   if (enable) {
     silentLogging = true;
     std::unique_ptr<LoggerFactory> loggerFactory = SilentLoggerFactory::create();
@@ -216,6 +257,8 @@ void bind_client(Module& module) {
     .define_method("concurrent_lookup_requests=", &pulsar_rb::ClientConfiguration::setConcurrentLookupRequest)
     .define_method("log_conf_file_path", &pulsar_rb::ClientConfiguration::getLogConfFilePath)
     .define_method("log_conf_file_path=", &pulsar_rb::ClientConfiguration::setLogConfFilePath)
+    .define_method("log_level", &pulsar_rb::ClientConfiguration::getLogLevel)
+    .define_method("log_level=", &pulsar_rb::ClientConfiguration::setLogLevel)
     .define_method("silent_logging?", &pulsar_rb::ClientConfiguration::getSilentLogging)
     .define_method("silent_logging=", &pulsar_rb::ClientConfiguration::setSilentLogging)
     .define_method("use_tls?", &pulsar_rb::ClientConfiguration::isUseTls)

ext/bindings/client.hpp

@@ -14,6 +14,9 @@ namespace pulsar_rb {
   public:
     pulsar::ClientConfiguration _config;
     bool silentLogging = false;
+    std::string logConfigFilePath = "STDOUT";
+    std::string logLevel = "DEBUG";
+
     ClientConfiguration();
 
     void setAuthFromToken(const std::string &token);
@@ -28,6 +31,8 @@ namespace pulsar_rb {
     void setConcurrentLookupRequest(int n);
     std::string getLogConfFilePath();
     void setLogConfFilePath(const std::string& path);
+    void setLogLevel(const std::string& level);
+    std::string getLogLevel();
     void setSilentLogging(bool);
     bool getSilentLogging();
     bool isUseTls();

ext/bindings/extconf.rb

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'mkmf-rice'
 $LOCAL_LIBS << "-lpulsar"
 $CXXFLAGS += " -std=c++11 "

lib/pulsar/client/version.rb

@@ -19,6 +19,6 @@
 
 module Pulsar
   class Client
-    VERSION = "2.6.1-beta.2"
+    VERSION = "3.4.2"
   end
 end

lib/pulsar/client_configuration.rb

@@ -138,6 +138,7 @@ def populate(config={})
       populate_one(config, :message_listener_threads)
       populate_one(config, :concurrent_lookup_requests)
       populate_one(config, :log_conf_file_path)
+      populate_one(config, :log_level)
       populate_one(config, :silent_logging)
       populate_one(config, :use_tls)
       populate_one(config, :tls_trust_certs_file_path)

pulsar-client.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.extensions    = ["ext/bindings/extconf.rb"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  # spec.add_development_dependency "bundler", "~> 2.1"
+  # spec.add_development_dependency "rake", "~> 13"
+  # spec.add_development_dependency "rspec", "~> 3.10"
 
-  spec.add_dependency "rake-compiler", "~> 1.0"
-  spec.add_dependency "rice", "~> 2.1"
+  spec.add_dependency "rake-compiler", "~> 1.2"
+  spec.add_dependency "rice", "~> 3.0"
 end