centralized_ruby_logger 0.0.12 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fcfa42cda13a4d02dd703a4e0195f8342c61df99
-  data.tar.gz: df8c24a7dfeedf6209ec46ce282a0ab18d3aae1c
+SHA256:
+  metadata.gz: 33ef705c6e4330c8a36cb16984aad708dad39b48a4a78b3c01cec87c5c99c498
+  data.tar.gz: f478764300a534ca8864702c256feecbc035bc4238edc6b6d9d623dfcf1753d0
 SHA512:
-  metadata.gz: f117003aebbd6b711f6ce73f0c664499aa6428010bdc103b22c13554c4eb92acfa1c5a46d67386de6f12f429aa2796a9d0becc45ffa59c4899c3cf869567bd68
-  data.tar.gz: aa93ae24dca04354c48318ba61e330c23ccf3c94b414ead4090714b13f63758d7a379ab9882089db674d80046bb45cc9d9185dc9a644d9f01fbb9d477e37182e
+  metadata.gz: 8e386b8e11d8986d302d656dd2e7652ac754287d3be7b4dfbc927c862d8852d669fa23c0c661283bacd40a70e8378db1bf0f74f9d3f5096d80def7573faef756
+  data.tar.gz: 7fdc6c0d177fabda7dd0e0f91f32e49a9ce4e10d94c621e8c41e46a42c0ff44a9a7f595f9e503ebe9f8924b39232b7cb91a20832dcbe640f9ae7880effed6ef3

data/lib/centralized_ruby_logger.rb

@@ -8,10 +8,15 @@ module Coralogix
         # Constructor. 
         #
         # @param name    -   logger name.
-        def initialize private_key, app_name, sub_system_name, debug=false, type_name="Centralized Ruby", force_compression = false
+        def initialize private_key, app_name, sub_system_name, debug=false, type_name="Centralized Ruby", force_compression=false, proxy={}, external_logger=nil
             self.debug_mode=debug            
             @category = CORALOGIX_CATEGORY
-            @manager = LoggerManager.new
+            @manager = LoggerManager.new proxy
+            unless external_logger.nil?
+                DebugLogger.enabled = true
+                DebugLogger.external = true
+                DebugLogger.logger = external_logger
+            end
             configure(private_key, app_name, sub_system_name, type_name, force_compression)
         end
 

data/lib/constants.rb

@@ -26,10 +26,10 @@ module Coralogix
 
 
     #Coralogix logs url
-    CORALOGIX_LOG_URL = "https://api.coralogix.com:443/api/v1/logs"
+    CORALOGIX_LOG_URL = ENV['CORALOGIX_LOG_URL'] ? ENV['CORALOGIX_LOG_URL'] : "https://api.coralogix.com:443/api/v1/logs"
 
     #Coralogix time delat url
-    CORALOGIX_TIME_DELTA_URL = "https://api.coralogix.com:443/sdk/v1/time"
+    CORALOGIX_TIME_DELTA_URL = ENV['CORALOGIX_TIME_DELTA_URL'] ? ENV['CORALOGIX_TIME_DELTA_URL'] : "https://api.coralogix.com:443/sdk/v1/time"
 
     #Default private key
     FAILED_PRIVATE_KEY = "9626c7dd-8174-5015-a3fe-5572e042b6d9"

data/lib/debug_logger.rb

@@ -4,45 +4,65 @@ module Coralogix
     # @private
     class DebugLogger
 
+        # attr_accessor :external, :enabled, :logger
+
         def self.initialize
             begin
                 @mutex = Mutex.new
-                @debug = false
+                @enabled = false
+                @external = false
             rescue Exception => e
-                if @debug  
+                if @enabled 
                     puts e.message  
                     puts e.backtrace.inspect  
                 end
             end
         end 
 
+        def self.enabled=(value)
+            @enabled = value
+        end
+
+        def self.external=(value)
+            @external = value
+        end
+
+        def self.logger=(value)
+            @logger = value
+        end
+
         def self.debug_mode?
-            @debug
+            @enabled
         end
 
         def self.debug_mode=(value)
             begin
-                @debug = value
+                @enabled = value
                 if value
                     @logger = Logger.new("/tmp/#{LOG_FILE_NAME}", 1, 10485760)
                 else
-                    @logger.close unless @logger == nil
-                    @logger = nil
+                    if @external == false
+                        @logger.close unless @logger == nil
+                        @logger = nil
+                    end
                 end
             rescue Exception => e
-                if @debug  
+                if @enabled  
                     puts e.message  
                     puts e.backtrace.inspect  
                 end
             end
         end
 
+        Logger::Severity.const_set("TRACE", 0)
         Logger::Severity.constants.each do |level|
             define_singleton_method("#{level.downcase}") do |*args|
-                if @debug
+                if @enabled
                     @mutex.synchronize do
                         begin
-                            puts "#{__method__.upcase}:  #{Time.now.strftime('%H:%M:%S.%L')} - #{args}"
+                            if @external == false
+                                puts "#{__method__.upcase}:  #{Time.now.strftime('%H:%M:%S.%L')} - #{args}"
+                            end
                             @logger.send("#{__method__}", args)
                         rescue Exception => e
                             puts e.message  
@@ -50,10 +70,9 @@ module Coralogix
                         end
                     end
                 end
-            end  
+            end
         end
 
-
         initialize
     
     end

data/lib/httpsender.rb

@@ -25,7 +25,7 @@ module Coralogix
             @force_compression = value
         end
 
-        def initialize
+        def initialize proxy={}
             begin
                 @initialized = false
                 @mutex = Mutex.new
@@ -33,7 +33,18 @@ module Coralogix
                 if(@disable_proxy)
                     @http = Net::HTTP.new(@uri.host, @uri.port, p_addr=nil, p_port=nil)
                 else
-                    @http = Net::HTTP.new(@uri.host, @uri.port)
+                    if proxy.empty? or proxy.fetch("host", nil).nil? or proxy.fetch("port", nil).nil?
+                        @http = Net::HTTP.new(@uri.host, @uri.port)
+                    else
+                        @http = Net::HTTP.new(
+                            @uri.host,
+                            @uri.port,
+                            p_addr=proxy["host"],
+                            p_port=proxy["port"],
+                            p_user=proxy.fetch("user", nil),
+                            p_pass=proxy.fetch("password", nil)
+                        )
+                    end
                 end
                 @http.use_ssl = true
                 #@http.keep_alive_timeout = 10
@@ -75,13 +86,13 @@ module Coralogix
                 attempt = 0
                 while attempt < HTTP_SEND_RETRY_COUNT
                     begin
-                        DebugLogger.info "About to send bulk to Coralogix server. Attempt number: #{attempt+1}"
+                        DebugLogger.debug "About to send bulk to Coralogix server. Attempt number: #{attempt+1}"
 
-                        DebugLogger.debug "Compressing bulk..."
+                        DebugLogger.trace "Compressing bulk..."
                         zippedBulk = json2zip(bulk.to_json)
 
                         if zippedBulk.nil? && !@force_compression
-                            DebugLogger.info "Failed to compress bulk, sending raw data instead" 
+                            DebugLogger.debug "Failed to compress bulk, sending raw data instead" 
                             @req = Net::HTTP::Post.new(@uri.path, 'Content-Type' => 'application/json')
                             @req.body = bulk.to_json
                         else
@@ -90,13 +101,13 @@ module Coralogix
                                 DebugLogger.error "Compressed bulk is nil"
                             end
 
-                            DebugLogger.debug "Sending compressed bulk"
+                            DebugLogger.trace "Sending compressed bulk"
                             @req.body = zippedBulk
                         end
-                        
-                        DebugLogger.debug Benchmark.measure { 
+
+                        DebugLogger.trace Benchmark.measure { 
                             res = @http.request(@req)
-                            DebugLogger.info "Successfully sent bulk to Coralogix server. Result is: #{res.code}"
+                            DebugLogger.debug "Successfully sent bulk to Coralogix server. Result is: #{res.code}"
                         }.to_s
                         return true
                     rescue Exception => e  
@@ -116,7 +127,7 @@ module Coralogix
         def get_time_sync
             @mutex.synchronize do
                 begin
-                    DebugLogger.info "Syncing time with coralogix server"
+                    DebugLogger.trace "Syncing time with coralogix server"
                     res = @http.get(CORALOGIX_TIME_DELTA_URL)
                     
                     if res.is_a?(Net::HTTPSuccess) && !res.body.to_s.empty?
@@ -129,7 +140,7 @@ module Coralogix
                         local_time = Time.now.utc
                         
                         time_delta = (server_time - local_time) * 1000.0
-                        DebugLogger.info "Updating time delta to: #{time_delta}"
+                        DebugLogger.trace "Updating time delta to: #{time_delta}"
                         return true, time_delta
                     end
                     return false, 0

data/lib/manager.rb

@@ -10,12 +10,12 @@ module Coralogix
 
         attr_accessor :configured
 
-        def initialize
+        def initialize proxy={}
             @logger_type = "Centralized Ruby"
             @bulk_template = {:privateKey => FAILED_PRIVATE_KEY, :applicationName => NO_APP_NAME, :subsystemName => NO_SUB_SYSTEM}
             @time_delta_last_update = 0
             @time_delta = 0
-            @http_sender = CoralogixHTTPSender.new
+            @http_sender = CoralogixHTTPSender.new proxy
             @buffer = []
             @buffer_size = 0
             @mutex = Mutex.new
@@ -32,7 +32,7 @@ module Coralogix
         def configure args={}
             begin
                 @bulk_template = args.merge({:computerName => `hostname`.strip})
-                DebugLogger.info "Successfully configured Coralogix logger."
+                DebugLogger.debug "Successfully configured Coralogix logger."
                 @configured = true                
                 add_logline "The Application Name #{@bulk_template[:applicationName]} and Subsystem Name #{@bulk_template[:subsystemName]} from the #{@logger_type} SDK, version #{version?} has started to send data.", Severity::INFO, CORALOGIX_CATEGORY 
             rescue Exception => e  
@@ -84,6 +84,8 @@ module Coralogix
                         @buffer << new_entry
                         #Update the buffer size to reflect the new size.
                         @buffer_size+=new_entry.to_json.bytesize
+                    else
+                        DebugLogger.warn "max logs exceeded, dropping log"
                     end
                 end
             rescue Exception => e  
@@ -144,16 +146,16 @@ module Coralogix
                     # we need to take it anyway.
                     size = size > 0 ? size : 1
 
-                    DebugLogger.info "Checking buffer size. Total log entries is: #{size}"
+                    DebugLogger.debug "Checking buffer size. Total log entries is: #{size}"
                     @bulk_template[:logEntries] = @buffer.shift(size)
 
                     # Extract from the buffer size the total amount of the logs we removed from the buffer
-                    @buffer_size-= (@bulk_template[:logEntries].to_json.bytesize - 2 - size-1)
+                    @buffer_size-= (@bulk_template[:logEntries].to_json.bytesize - 2 - (size-1))
 
                     # Make sure we are always positive
                     @buffer_size = @buffer_size >= 0 ? @buffer_size : 0
 
-                    DebugLogger.info "Bufer size after removal is: #{@buffer.join(",").bytesize}"
+                    DebugLogger.debug "Bufer size after removal is: #{@buffer.join(",").bytesize}"
                 end
                 @http_sender.send_request(@bulk_template) unless @bulk_template[:logEntries].empty?
             rescue Exception => e  
@@ -209,7 +211,7 @@ module Coralogix
                         # Check when is the next time we should send logs?
                         # If we already have at least half of the max chunk size then we are working in fast mode
                         next_check_interval = @buffer_size > (MAX_LOG_CHUNK_SIZE / 2) ? FAST_SEND_SPEED_INTERVAL : NORMAL_SEND_SPEED_INTERVAL
-                        DebugLogger.debug "Next buffer check is scheduled in #{next_check_interval} seconds"
+                        DebugLogger.trace "Next buffer check is scheduled in #{next_check_interval} seconds"
                         sleep next_check_interval
                     end
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: centralized_ruby_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.17
 platform: ruby
 authors:
 - Royee Goldberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies: []
 description: Coralogix Centralized Ruby Logger to send logs to Coralogix server.
 email: royee@coralogix.com
@@ -27,7 +27,7 @@ homepage: http://www.coralogix.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -42,9 +42,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.3
+signing_key:
 specification_version: 4
 summary: Coralogix Centralized Ruby Logger SDK
 test_files: []