thinkingdata-ruby 2.0.0 → 2.0.2

data/lib/thinkingdata-ruby/td_logger_consumer.rb

@@ -1,77 +1,99 @@
-require 'logger'
-require 'thinkingdata-ruby/td_errors'
-
-module ThinkingData
-
-  ##
-  # Dismantle the header and save it under another name
-  class HeadlessLogger < Logger
-    def initialize(logdev, shift_age = 0, shift_size = 1048576)
-      super(nil)
-      if logdev
-        @logdev = HeadlessLogger::LogDevice.new(logdev, shift_age: shift_age, shift_size: shift_size)
-      end
-    end
-
-    class LogDevice < ::Logger::LogDevice
-      def add_log_header(file); end
-    end
-  end
-
-  ##
-  # Write data to file, it works with LogBus
-  class TDLoggerConsumer
-
-    ##
-    # Init logger consumer
-    #   @param log_path: log file's path
-    #   @param mode: file rotate mode
-    #   @param prefix: file prefix
-    def initialize(log_path='.', mode='daily', prefix:'te.log')
-      case mode
-      when 'hourly'
-        @suffix_mode = '%Y-%m-%d-%H'
-      when 'daily'
-        @suffix_mode = '%Y-%m-%d'
-      else
-        raise IllegalParameterError.new("#{mode} is unsupported for LoggerConsumer. Replaced it by daily or hourly")
-      end
-
-      raise IllegalParameterError.new("prefix couldn't be empty") if prefix.nil? || prefix.length == 0
-
-      @current_suffix = Time.now.strftime(@suffix_mode)
-      @log_path = log_path
-      @full_prefix = "#{log_path}/#{prefix}"
-      TDLog.info("TDLoggerConsumer init success. LogPath: #{log_path}")
-      _reset
-    end
-
-    def add(msg)
-      unless Time.now.strftime(@suffix_mode) == @current_suffix
-        @logger.close
-        @current_suffix = Time.now.strftime(@suffix_mode)
-        _reset
-      end
-      msg_json_str = msg.to_json
-      TDLog.info("Write data to file: #{msg_json_str}")
-      @logger.info(msg_json_str)
-    end
-  
-    def close
-      @logger.close
-      TDLog.info("TDLoggerConsumer close.")
-    end
-
-    private
-
-    def _reset
-      Dir::mkdir(@log_path) unless Dir::exist?(@log_path)
-      @logger = HeadlessLogger.new("#{@full_prefix}.#{@current_suffix}")
-      @logger.level = HeadlessLogger::INFO
-      @logger.formatter = proc do |severity, datetime, progname, msg|
-        "#{msg}\n"
-      end
-    end
-
-  end
+require 'logger'
+require 'fileutils'
+require 'thinkingdata-ruby/td_errors'
+
+module ThinkingData
+
+  ##
+  # Dismantle the header and save it under another name
+  class HeadlessLogger < Logger
+    def initialize(logdev, shift_age = 0, shift_size = 1048576)
+      super(nil)
+      if logdev
+        @logdev = HeadlessLogger::LogDevice.new(logdev, shift_age: shift_age, shift_size: shift_size)
+      end
+    end
+
+    class LogDevice < ::Logger::LogDevice
+      def add_log_header(file); end
+    end
+  end
+
+  ##
+  # Write data to file, it works with LogBus
+  class TDLoggerConsumer
+
+    ##
+    # Init logger consumer
+    #   @param log_path: log file's path
+    #   @param mode: file rotate mode
+    #   @param prefix: file prefix
+    def initialize(log_path='.', mode='daily', prefix:'te.log')
+      case mode
+      when 'hourly'
+        @suffix_mode = '%Y-%m-%d-%H'
+      when 'daily'
+        @suffix_mode = '%Y-%m-%d'
+      else
+        raise IllegalParameterError.new("#{mode} is unsupported for LoggerConsumer. Replaced it by daily or hourly")
+      end
+
+      raise IllegalParameterError.new("prefix couldn't be empty") if prefix.nil? || prefix.length == 0
+
+      @current_suffix = Time.now.strftime(@suffix_mode)
+      @log_path = log_path
+      @full_prefix = "#{log_path}/#{prefix}"
+      @mutex = Mutex.new
+      @owner_pid = Process.pid
+      TDLog.info("TDLoggerConsumer init success. LogPath: #{log_path}")
+      _reset
+    end
+
+    def add(msg)
+      _reset_after_fork_if_needed
+      @mutex.synchronize do
+        unless Time.now.strftime(@suffix_mode) == @current_suffix
+          @logger.close
+          @current_suffix = Time.now.strftime(@suffix_mode)
+          _reset
+        end
+        msg_json_str = msg.to_json
+        TDLog.info("Write data to file: #{msg_json_str}")
+        @logger.info(msg_json_str)
+      end
+    end
+  
+    def flush
+      # Logger writes immediately on each call, no explicit flush needed
+      TDLog.info("TDLoggerConsumer flush.")
+    end
+
+    def close
+      _reset_after_fork_if_needed
+      @mutex.synchronize do
+        @logger.close
+      end
+      TDLog.info("TDLoggerConsumer close.")
+    end
+
+    private
+
+    def _reset
+      FileUtils.mkdir_p(@log_path)
+      @logger = HeadlessLogger.new("#{@full_prefix}.#{@current_suffix}")
+      @logger.level = HeadlessLogger::INFO
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        "#{msg}\n"
+      end
+    end
+
+    def _reset_after_fork_if_needed
+      return if @owner_pid == Process.pid
+      @owner_pid = Process.pid
+      @mutex = Mutex.new
+      @logger = nil  # Don't close — FD is shared with parent
+      _reset
+    end
+
+  end
 end

data/lib/thinkingdata-ruby/td_version.rb

@@ -1,3 +1,3 @@
-module ThinkingData
-  VERSION = '2.0.0'
-end
+module ThinkingData
+  VERSION = '2.0.2'
+end

data/lib/thinkingdata-ruby.rb

@@ -1,5 +1,5 @@
-require 'thinkingdata-ruby/td_logger_consumer'
-require 'thinkingdata-ruby/td_debug_consumer'
-require 'thinkingdata-ruby/td_batch_consumer'
-require 'thinkingdata-ruby/td_analytics'
+require 'thinkingdata-ruby/td_logger_consumer'
+require 'thinkingdata-ruby/td_debug_consumer'
+require 'thinkingdata-ruby/td_batch_consumer'
+require 'thinkingdata-ruby/td_analytics'
 require 'thinkingdata-ruby/td_errors'

data/thinkingdata-ruby.gemspec

@@ -1,16 +1,16 @@
-require File.join(File.dirname(__FILE__), 'lib/thinkingdata-ruby/td_version.rb')
-
-spec = Gem::Specification.new do |spec|
-  spec.name = 'thinkingdata-ruby'
-  spec.version = ThinkingData::VERSION
-  spec.files = Dir.glob(`git ls-files`.split("\n"))
-  spec.require_paths = ['lib']
-  spec.summary = 'Official ThinkingData Analytics API for ruby'
-  spec.description = 'The official ThinkingData Analytics API for ruby'
-  spec.authors = [ 'ThinkingData' ]
-  spec.email = 'sdk@thinkingdata.cn'
-  spec.homepage = 'https://github.com/ThinkingDataAnalytics/ruby-sdk'
-  spec.license = 'Apache-2.0'
-
-  spec.required_ruby_version = '>= 2.0.0'
-end
+require File.join(File.dirname(__FILE__), 'lib/thinkingdata-ruby/td_version.rb')
+
+spec = Gem::Specification.new do |spec|
+  spec.name = 'thinkingdata-ruby'
+  spec.version = ThinkingData::VERSION
+  spec.files = Dir.glob(`git ls-files`.split("\n"))
+  spec.require_paths = ['lib']
+  spec.summary = 'Official ThinkingData Analytics API for ruby'
+  spec.description = 'The official ThinkingData Analytics API for ruby'
+  spec.authors = [ 'ThinkingData' ]
+  spec.email = 'sdk@thinkingdata.cn'
+  spec.homepage = 'https://github.com/ThinkingDataAnalytics/ruby-sdk'
+  spec.license = 'Apache-2.0'
+
+  spec.required_ruby_version = '>= 2.0.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinkingdata-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - ThinkingData
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies: []
 description: The official ThinkingData Analytics API for ruby
 email: sdk@thinkingdata.cn
@@ -34,7 +34,7 @@ homepage: https://github.com/ThinkingDataAnalytics/ruby-sdk
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -49,8 +49,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Official ThinkingData Analytics API for ruby
 test_files: []