coralogix_logger 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c5d0a570367d7f09db6373731c63d4bd72c371b
-  data.tar.gz: 57d1575a153a76b373dcca9bc40b20dc008f2b63
+  metadata.gz: 8b98eed406daf139ae01da99ada18bca27894806
+  data.tar.gz: 582c53c819ef189baf3e868f81f28c040e430aba
 SHA512:
-  metadata.gz: 776b1f52f20a9efb16ea4b8330b61022d2bf3d343e712d9fa8bf652639c7fe585dc6b91409d780f24da27fcb3f36c241ab78b80e84816c4bd8859dae026be441
-  data.tar.gz: 6ddd07d66911f78fafc5f648ba4081c84599ced58026c713a729199788d246d7584bf8bd88dc82e8591d79de3bd84bea526886d63926c2ab03a298fcada96a15
+  metadata.gz: d181105e0d9df98cb669ed92dbd9a26dcbbeceb1504b698cdb3cabee2b80e15b25d1b64febc77277a15eb3a07981474f0c46208aa7ad67c9facdfd45e845b7ff
+  data.tar.gz: f1ba2926d95161c93194597234842d54eb10b1b37ece597c086163a92720e15c2623b321fd756fc0fe14dfd2093121b5e15207605994a75367945e6aaa2ec0d6

data/lib/coralogix_logger.rb

@@ -6,15 +6,29 @@ require_relative 'constants'
 module Coralogix
 
     class CoralogixLogger
+
+        attr_accessor :use_source_file
+        
         # Set 'new' method to be a private method. 
         # This way it won't be possible to create a new intance of this class from outside.
         private_class_method :new
 
+
         # Constructor. 
         #
         # @param name    -   logger name.
         def initialize name
             @category = name
+            @level=0
+            @use_source_file = true
+        end
+
+        # Logger interface:  
+        # Set Logger level
+        #
+        # @param name   -   level
+        def level= level
+            @level=level
         end
 
         # A getter for debug_mode. 
@@ -88,6 +102,82 @@ module Coralogix
                 LoggerManager.add_logline message, SEVERITIES["#{__method__}".to_sym], category, :className => className, :methodName => methodName, :threadId => threadId
             end  
         end
+
+        # Logger interface: 
+        # Send log message if the given severity is high enough.
+        # @param severity   -   Severity.  Constants are defined in Logger namespace: +DEBUG+, +INFO+, +WARN+, +ERROR+, +FATAL+, or +UNKNOWN
+        # @param message   -   The log message.  A String or Exception.
+        # @param progname   -   Program name string.  Can be omitted.  Treated as a message if no +message+ and +block+ are given.
+        # @param block   -   Can be omitted.  Called to get a message string if +message+ is nil.
+        # @return [boolean] When the given severity is not high enough (for this particular logger), log no message, and return true.
+        def add(severity, message = nil, progname = nil, &block)
+            begin
+                severity ||= DEBUG
+                if severity < @level
+                    return true
+                end
+                progname ||= @category
+                if message.nil?
+                    if block_given?
+                        message = yield
+                    else
+                        message = progname
+                        progname = @category
+                    end
+                end
+                className = get_source_file if @use_source_file
+            rescue Exception => e  
+                DebugLogger.error e.message  
+                DebugLogger.error e.backtrace.inspect
+            end
+
+            # Map Ruby Severity to Coralogix severity:
+            #          Ruby Coralogix
+            #    DEBUG  0      1
+            #    INFO   1      3
+            #    WARN   2      4
+            #    ERROR  3      5
+            #    FATAL  4      6
+            LoggerManager.add_logline message, severity == 0 ? Severity::DEBUG : severity + 2, progname, :className => className
+        end
+
+        # Logger interface: 
+        # Dump given message to the log device without any formatting.  
+        def << x
+            self.add 0, nil, x
+        end
+
+        # Logger interface: 
+        # Set logger program name. This will be used as the category.
+        def progname= name
+            @category = name
+        end
+
+        # Logger interface:
+        # Set logger formatter
+        def formatter= formatter
+            # Nothing to do here as we always use Coralogix format
+        end
+
+        # Logger interface: 
+        # Close coralogix logger. Not implemented
+        def close
+            # Not implemented
+        end
+
+        # Return the file name where the call to the logger was made. This will be used as the class name
+        def get_source_file
+            begin
+                #        0                          1                               2                   3
+                #logger.info(Rails logger) -> Logger.broadcast(Rails Logger)-> add(This class) -> get_source_file(This method)
+                file_location_path = caller_locations(4..4)[0].path
+                File.basename(file_location_path, File.extname(file_location_path))
+            rescue Exception => e  
+                DebugLogger.error e.message  
+                DebugLogger.error e.backtrace.inspect
+                return nil
+            end
+        end
     end
 
 end

data/lib/manager.rb

@@ -34,7 +34,7 @@ module Coralogix
                 @bulk_template = args.merge({:computerName => `hostname`.strip})
                 DebugLogger.info "Successfully configured Coralogix logger."
                 @configured = true                
-                self.update_time_delta_interval
+                #self.update_time_delta_interval
                 self.add_logline "The Application Name #{@bulk_template[:applicationName]} and Subsystem Name #{@bulk_template[:subsystemName]} from the Ruby SDK, version #{self.version?} has started to send data.", Severity::INFO, CORALOGIX_CATEGORY 
             rescue Exception => e  
                 DebugLogger.error e.message  
@@ -69,10 +69,8 @@ module Coralogix
             begin
                 @mutex.synchronize do
                     if @buffer_size < MAX_LOG_BUFFER_SIZE
-                        
                         #Validate message
-                        message = (message.nil? || message.to_s.strip.empty?) ? "EMPTY_STRING" : message.to_s
-
+                        message = (message.nil? || message.to_s.strip.empty?) ? "EMPTY_STRING" : self.msg2str(message)
                         #Validate severity
                         severity = (severity.nil? || severity.to_s < Severity::DEBUG.to_s || severity.to_s > Severity::CRITICAL.to_s) ? Severity::DEBUG : severity
 
@@ -94,6 +92,28 @@ module Coralogix
             return true
         end
 
+        # Convert log message to string
+        # @param msg    -   log message to convert
+        #
+        # @return [String] return log message as string
+        def self.msg2str(msg)
+            begin
+                case msg
+                    when ::String
+                        msg
+                    when ::Exception
+                        "#{ msg.message } (#{ msg.class })\n" <<
+                            (msg.backtrace || []).join("\n")
+                    else
+                        msg.inspect
+                end
+            rescue Exception => e
+                DebugLogger.error e.message
+                DebugLogger.error e.backtrace.inspect
+                return msg
+            end
+        end
+
         # Send bulk from the buffer
         def self.send_bulk
             begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coralogix_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Royee Goldberg