logdna 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 394ed1eb0fcbf401b7772034a2b4dcbe36dfcd3f
-  data.tar.gz: 38443b4682659a71e2796760a89dfa7e3309f1ed
+  metadata.gz: 6da31685ff73906727582ec00d03ce4e2769032f
+  data.tar.gz: f9926e2524488199bd6d3a7e8893ce051250434a
 SHA512:
-  metadata.gz: cd7bb549b3c864bdd95f1b4af5fbc7210c4547624dbbe8fbe221e7c4ce779eaa8102f960d852961195f5fbf43351e7347ba650ba28fa7148311d3cda4b23f379
-  data.tar.gz: '089b7de0b866804472b1304eadc64f6008cc97434465f60f60a8e8379e3d8e40fdf6f777488df1983ed268ab7c33b3e6f2d726aa430bdf8f18d5d4e559d5c042'
+  metadata.gz: 9655acac1f9eaafe8f0e37a17d90159bbcb8cfe2745bfaa1cef3327b0b3550ce3dbbd1b1178bdb83bc17422add250e3440bcf09ec1b8365f18a540c4df7454fe
+  data.tar.gz: 72ae741872be4ef83cbceb9271bfedf7987939a558afbfc6d315a34e372cc0708d851c79d75735bf389bf0fa80cfa12887d8a8a8b905cf8e4a6729ece9f73f51

data/README.md

@@ -55,16 +55,11 @@ Options are optional variables that may contain hostname, app name, mac address,
 
 To send logs, use "log" method.
 
-    require 'logdna'
-
-    logger = LogDNA::Ruby.new(your_ingestion_key, options)
-    => #<Logdna::Ruby:0x00000000000000>
-
     logger.log('This is my first log')
     => "Saved"  # Saved to buffer. Ready to be flushed automatically
 
 
-By default, it will log at the level of "INFO" unless you specified otherwise during initialzation of the logger. 
+By default, it will log at the level of "INFO" unless you specified otherwise during the initialzation of the logger. 
 You can change a particular message's log level.
 
     logger.log('This is warn message', {:level => "WARN"})
@@ -77,7 +72,21 @@ You can also send a metadata with your message by specifying 'meta' field
 
 Hostname and app name cannot be more than 80 characters.
 
-You can search logs by environment in a form of 'env:staging' or '_env:staging' in logdna search bar. 
+This logger extends the standard Ruby logger and inherits some of the conventions from it. 
+
+    logger.info('This is info log')   # same as logger.log('This is info message', {:level => "INFO"})
+    logger.info? => true
+    logger.trace('trace log')
+    logger.error('error log')
+
+You can also set logger level, environment, app name this way:
+
+    logger.env = 'PRODUCTION'
+    logger.app = 'NEW APP NAME'
+    logger.level = 'FATAL'
+    logger.level = Logger::FATAL
+
+
 
 
 # Important Notes

data/lib/logdna.rb

@@ -4,7 +4,8 @@ require 'socket'
 require_relative 'logdna/client.rb'
 require_relative 'logdna/resources.rb'
 module Logdna
-    class Ruby
+    class Ruby < ::Logger
+        Logger::TRACE = 5
         attr_accessor :level, :app, :env
         @level = nil
         @app = nil
@@ -13,6 +14,7 @@ module Logdna
         def initialize(key, opts={})
             @@client = Logdna::Client.new(key, opts)
             sleep 0.01
+
             if @@client[:value] === Resources::LOGGER_NOT_CREATED
                 @@client = nil
                 puts "LogDNA logger not created"
@@ -28,79 +30,145 @@ module Logdna
                 @env = nil
             end
 
-            if @@client.nil?
-                puts "Logger Not Initialized Yet"
-                return
-            end
+            loggerExist?
             @response = @@client.tobuffer(msg, opts)
             'Saved'
         end
 
-
         def trace(msg, opts={})
             opts[:level] = "TRACE"
-            if @@client.nil?
-                puts "Logger Not Initialized Yet"
-                return
-            end
+            loggerExist?
             @response = @@client.tobuffer(msg, opts)
             'Saved'
         end
 
         def debug(msg, opts={})
             opts[:level] = "DEBUG"
-            if @@client.nil?
-                puts "Logger Not Initialized Yet"
-                return
-            end
+            loggerExist?
             @response = @@client.tobuffer(msg, opts)
             'Saved'
         end
 
         def info(msg, opts={})
             opts[:level] = "INFO"
-            if @@client.nil?
-                puts "Logger Not Initialized Yet"
-                return
-            end
+            loggerExist?
             @response = @@client.tobuffer(msg, opts)
             'Saved'
         end
 
         def warn(msg, opts={})
             opts[:level] = "WARN"
-            if @@client.nil?
-                puts "Logger Not Initialized Yet"
-                return
-            end
+            loggerExist?
             @response = @@client.tobuffer(msg, opts)
             'Saved'
         end
 
         def error(msg, opts={})
             opts[:level] = "ERROR"
-            if @@client.nil?
-                puts "Logger Not Initialized Yet"
-                return
-            end
+            loggerExist?
             @response = @@client.tobuffer(msg, opts)
             'Saved'
         end
 
         def fatal(msg, opts={})
             opts[:level] = "FATAL"
+            loggerExist?
+            @response = @@client.tobuffer(msg, opts)
+            'Saved'
+        end
+
+        def trace?
+            loggerExist?
+            unless @level
+                return 'TRACE' == @@client.getLevel
+            end
+            logLevel('TRACE')
+        end
+
+        def debug?
+            loggerExist?
+            unless @level
+                return 'DEBUG' == @@client.getLevel
+            end
+            logLevel('DEBUG')
+        end
+
+        def info?
+            loggerExist?
+            unless @level
+                return 'INFO' == @@client.getLevel
+            end
+            logLevel('INFO')
+        end
+
+        def warn?
+            loggerExist?
+            unless @level
+                return 'WARN' == @@client.getLevel
+            end
+            logLevel('WARN')
+        end
+
+        def error?
+            loggerExist?
+            unless @level
+                return 'ERROR' == @@client.getLevel
+            end
+            logLevel('ERROR')
+        end
+
+        def fatal?
+            loggerExist?
+            unless @level
+                return 'FATAL' == @@client.getLevel
+            end
+            logLevel('FATAL')
+        end
+
+        def loggerExist?
             if @@client.nil?
                 puts "Logger Not Initialized Yet"
-                return
+                close
             end
-            @response = @@client.tobuffer(msg, opts)
-            'Saved'
+        end
+
+        def logLevel(comparedTo)
+            if @level.is_a? Numeric
+                @level = Resources::LOG_LEVELS[@level]
+            end
+            return comparedTo == @level.upcase
+        end
+
+        def <<(*arg)
+            puts "<< not supported in LogDNA logger"
+            return false
+        end
+
+        def add(*arg)
+            puts "add not supported in LogDNA logger"
+            return false
+        end
+
+        def unknown(*arg)
+            puts "unknown not supported in LogDNA logger"
+            return false
+        end
+
+        def datetime_format(*arg)
+            puts "datetime_format not supported in LogDNA logger"
+            return false
         end
 
 
+        def close
+            if @@client
+                @@client.exitout()
+            end
+            exit!
+        end
 
         at_exit do
-            if defined? @@client
+            if @@client
                 @@client.exitout()
             end
             exit!

data/lib/logdna/client.rb

@@ -69,6 +69,10 @@ module Logdna
             end
         end
 
+        def getLevel
+            @qs[:level].upcase
+        end
+
         def tobuffer(msg, opts)
             if @task
                 unless @task.running?
@@ -93,7 +97,7 @@ module Logdna
                 @currentbytesize += msg.bytesize
                 @firstbuff.push({
                     :line => msg,
-                    :app => @qs[:app],
+                    :app => opts[:app] ||= @qs[:app],
                     :level => opts[:level] ||= @qs[:level],
                     :timestamp => Time.now.to_i,
                     :meta => opts[:meta] ||= nil,
@@ -103,7 +107,7 @@ module Logdna
                 @secondbytesize += msg.bytesize
                 @secondbuff.push({
                     :line => msg,
-                    :app => @qs[:app],
+                    :app => opts[:app] ||= @qs[:app],
                     :level => opts[:level] ||= @qs[:level],
                     :timestamp => Time.now.to_i,
                     :meta => opts[:meta] ||= nil,

data/lib/logdna/resources.rb

@@ -1,6 +1,6 @@
 module Resources
 
-    LOG_LEVELS = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'].freeze
+    LOG_LEVELS = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'TRACE'].freeze
     DEFAULT_REQUEST_HEADER = { 'Content-Type': 'application/json; charset=UTF-8' }.freeze
     DEFAULT_REQUEST_TIMEOUT = 180000
     MS_IN_A_DAY = 86400000

data/lib/logdna/version.rb

@@ -1,3 +1,3 @@
 module LogDNA
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

data/test.rb

@@ -2,10 +2,15 @@ require 'require_all'
 require_all 'lib'
 
 
-options = {hostname: "yo", app: "globo-portal", env: "staging"}
+options = {hostname: "yondfsoikplghjniodhnfvreulwignfewfnrleuwinf"}
 
 
-logger1 = Logdna::Ruby.new('deb5d62d893e82d6b03f3d4c20b96e15', options)
+logger1 = Logdna::Ruby.new('Your ingestion key', options)
+
+logger1.level = Logger::TRACE
+logger1.log('is this trace')
+
+=begin
 logger1.level = Logger::WARN
 logger1.log('This should be warn')
 logger1.trace('This should be trace')
@@ -19,8 +24,15 @@ logger1.log('DEBUG log1')
 logger1.app = 'NEW APP NAME'
 logger1.env = 'Staging'
 logger1.level = 'INFO'
-logger1.log('are changes all updated')
 
+
+
+logger1.level = 'INFO'
+logger1.level == Logger::INFO
+
+
+logger1.log('are changes all updated')
+=end
 sleep 3
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logdna
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Gun Woo Choi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby