centralized_ruby_logger 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4dab8cd1a8f5995b0ec46e29b58e6fbfe0a8ca58
-  data.tar.gz: aec040ce3f19286bfb2528535c5b74af1a63d611
+SHA256:
+  metadata.gz: 3bb22fe0d8a38a7ea50b49d947081024babce01aa34f90ff8bfb7ce441dd9574
+  data.tar.gz: 367f73a60b64c522257eadc8202a447a8f0189956ef88808aec56dcaddf2afec
 SHA512:
-  metadata.gz: cb1a6a2f53882c21fcb499c681e9790beb929d2e7cef9b6bbad15802c932742043c9ade67614c8494dc04f877e00ce42c3ee57eea37cfe0d551a1a5fbf0e22cf
-  data.tar.gz: 2f92ce54afe38de49a8fc1b0ed2db40c7b9312399f83350f0f20dbb5b71e064706f70d4fae47db6911086621c95f21d958985f398583d4dc7678fde94b47c020
+  metadata.gz: 506e90154cc95961cf3937d82ff16ce9ce0d58a80322e2c3436307f1f2614f9cf57b8ed4e0365ab5ec1b9a4d6dea7ca44d562adb8349d3167852b442a071d8b4
+  data.tar.gz: c6355047fa329e7be8d38e4a88e43497f302233d8fba782a56acb59ba9fb26cec12de117f71735b1c771820bd3b47ab4a562570f4ddd2354139d371ab08f2b19

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,33 +4,50 @@ 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
@@ -39,10 +56,12 @@ module Coralogix
 
         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  

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
@@ -42,8 +53,8 @@ module Coralogix
                 @http.open_timeout = HTTP_TIMEOUT # seconds
 
                 headers = {
-                    'Content-Type': 'application/json',
-                    'Content-Encoding': 'deflate'
+                    'Content-Type' => 'application/json',
+                    'Content-Encoding' => 'deflate'
                 }
                 @req = Net::HTTP::Post.new(@uri.path, headers)
             rescue Exception => e  

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
@@ -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  
@@ -148,7 +150,7 @@ module Coralogix
                     @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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: centralized_ruby_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.16
 platform: ruby
 authors:
 - Royee Goldberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2021-03-11 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: []