logdna 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 447bf5da9312c5a9be6739a3fcc818cd8f847f38
-  data.tar.gz: 7f9745d98cb994409e5c769d239254e01ce2d27f
+  metadata.gz: ffae5e4ece7f38e30873cd4c0c2c3ab09a20dc4d
+  data.tar.gz: a1c0016a4717d6dce43ae7dbd6ec86dabbe7a2d9
 SHA512:
-  metadata.gz: aa969ca39b5e67c94882ba20b954c6abdca39600de8a0868c53be10e62bd414442f856d9420b334ff3cf212fca92fe2a244f2ada3b98f373fd73342807a43be0
-  data.tar.gz: 1736031941fec54f870e82708f6312acb0a4fe09cef45f6a10ce0f7c2fdfe07606f9c5b97652fb160711e3cc54ac9c6d5da682ade9b31f38970c5b6b043161fe
+  metadata.gz: 042d7396a605143d73bf42ed63ca4b8ee2b83b236d5de549eeba5b88c0bb43f7bf5b56172974ff1a51e6bd515f7653f4a49e8c9eda69c53eeb15f978c24faddd
+  data.tar.gz: 85f31559649c616406703bee27298cc75c5df975cd5e64a0a348741699f7f2b2f0f211fa3bbeac848b22be9af48862698ff014993037637a6f16a40dd0e29aa4

data/README.md

@@ -9,8 +9,8 @@
 ---
 
 * **[Installation](#installation)**
+* **[Quick Setup](#quick-setup)**
 * **[API](#api)**
-* **[Development](#development)**
 * **[Contributing](#contributing)**
 * **[License](#license)**
 
@@ -44,11 +44,12 @@ to set up the logger.
 Options are optional variables that may contain hostname, app name, mac address, ip address, log level specified.
 
     options = {
-        :hostname => myHostName
-        :ip =>  myIpAddress
-        :mac => myMacAddress
-        :app => myAppName
+        :hostname => myHostName,
+        :ip =>  myIpAddress,
+        :mac => myMacAddress,
+        :app => myAppName,
         :level => "INFO"    # LOG_LEVELS = ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] or your customized log level
+        :env => "PRODUCTION"
     }
 
 
@@ -71,11 +72,12 @@ You can change a particular message's log level.
 
 You can also send a metadata with your message by specifying 'meta' field
 
-    logger.log('This is a message with metadata', {:meta => {:once => {:first => {"nested1", "nested2"}, "second"}}, :level => "TRACE"})
+    logger.log('This is a message with metadata', {:meta => {:once => {:first => "nested1", :another => "nested2"}}, :level => "TRACE"})
 
 
 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. 
 
 
 # Important Notes
@@ -84,7 +86,6 @@ Hostname and app name cannot be more than 80 characters.
 2. This logger is a singleton (do not create mutiple instances of the logger) even though the singleton structure is not strongly enforced. 
 
 
-
 # API
 
 ## Logdna::Ruby.new(ingestion_key, options = {})
@@ -98,6 +99,7 @@ Instantiates a new instance of the class it is called on. ingestion_key is requi
 |{ :ip => IP address } | Nil |
 |{ :app => App name } | 'default' |
 |{ :level => Log level } | 'INFO' |
+|{ :env => STAGING, PRODUCTION .. etc} | Nil |
 |{ :flushtime => Log flush interval in seconds } | 0.25 seconds |
 |{ :flushbyte => Log flush upper limit in bytes } | 500000 bytes ~= 0.5 megabytes |
 

data/lib/logdna/client.rb

@@ -17,8 +17,9 @@ module Logdna
                     :ip =>  opts.key?(:ip) ? "&ip=#{opts[:ip]}" : "",
                     :mac => opts.key?(:mac) ? "&mac=#{opts[:mac]}" : "",
                     :app => (opts[:app] ||= "default"),
-                    :level => (opts[:level] ||= "INFO")
-                }
+                    :level => (opts[:level] ||= "INFO"),
+                    :env => (opts[:env])
+                }.reject { |k,v| k === :env && v.nil? }
 
                 begin
                     if (@qs[:hostname].size > Resources::MAX_INPUT_LENGTH || @qs[:app].size > Resources::MAX_INPUT_LENGTH )
@@ -73,16 +74,15 @@ module Logdna
             rescue Encoding::UndefinedConversionError => e
                 raise e
             end
-
             unless @semaphore.locked?
                 @currentbytesize += msg.bytesize
-
                 @firstbuff.push({
                     :line => msg,
                     :app => @qs[:app],
                     :level => opts[:level] ||= @qs[:level],
                     :timestamp => Time.now.to_i,
-                    :meta => opts[:meta] ||= nil
+                    :meta => opts[:meta] ||= nil,
+                    :env => (opts[:env]) ? opts[:env] : (@qs[:env]) ? @qs[:env] : nil
                 }.reject { |k,v| k === :meta && v.nil? })
             else
                 @secondbytesize += msg.bytesize
@@ -91,7 +91,8 @@ module Logdna
                     :app => @qs[:app],
                     :level => opts[:level] ||= @qs[:level],
                     :timestamp => Time.now.to_i,
-                    :meta => opts[:meta] ||= nil
+                    :meta => opts[:meta] ||= nil,
+                    :env => (opts[:env]) ? opts[:env] : (@qs[:env]) ? @qs[:env] : nil
                 }.reject { |k,v| k === :meta && v.nil? })
             end
 
@@ -108,7 +109,9 @@ module Logdna
                 @response = Net::HTTP.start(@uri.hostname, @uri.port, :use_ssl => @uri.scheme == 'https') do |http|
                   http.request(@request)
                 end
-                puts "Result: #{@response.body}"
+                unless @firstbuff.empty?
+                    puts "Result: #{@response.body}"
+                end
                 @currentbytesize = @secondbytesize
                 @secondbytesize = 0
                 @firstbuff = []

data/lib/logdna/resources.rb

@@ -15,4 +15,5 @@ module Resources
     IP_ADDR_CHECK = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
     LOGGER_NOT_CREATED = "LOGGER_NOT_CREATED"
     LOGGER_CREATED = "LOGGER_CREATED"
+
 end

data/lib/logdna/version.rb

@@ -1,3 +1,3 @@
 module LogDNA
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/logdna.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = 'Gun Woo Choi'
   spec.email         = 'matt.choi@logdna.com'
 
-  spec.summary       = 'LogDNA extension to ruby logger'
+  spec.summary       = 'LogDNA Ruby logger'
   spec.homepage      = 'https://github.com/logdna/ruby'
   spec.license       = 'MIT'
 
@@ -20,9 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0.5'
-  spec.add_runtime_dependency 'json', '~> 2.0.2'
-  spec.add_runtime_dependency 'openssl', '~> 2.0.3'
+  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
+  spec.add_runtime_dependency 'json', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.5'

data/test.rb

@@ -0,0 +1,42 @@
+require 'require_all'
+require_all 'lib'
+
+options = {
+    :level => "INFO",    # LOG_LEVELS = ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] or your customized log level
+    :flushtime => 0.1,
+    :env => 'PRODUCTION'
+}
+
+options2 = {
+    :level => "INFO",    # LOG_LEVELS = ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] or your customized log level
+    :flushtime => 0.1,
+    :env => 'STAGING'
+}
+
+options3 = {
+    :level => "INFO",    # LOG_LEVELS = ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] or your customized log level
+    :flushtime => 0.1,
+}
+
+options4 = {
+    :level => "INFO",    # LOG_LEVELS = ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] or your customized log level
+    :flushtime => 0.1,
+}
+
+
+
+
+logger = Logdna::Ruby.new('your-ingestion-key', options)
+logger.log('1No metadata, production env')
+
+logger = Logdna::Ruby.new('your-ingestion-key', options2)
+logger.log('2With metadata, staging env', {:meta => {:once => {:first => "nested1", :another => "nested2"}}, :level => "TRACE"})
+
+logger = Logdna::Ruby.new('your-ingestion-key', options3)
+logger.log('3No metadata, development env changed to production env', {:level => "TRACE", :env => "PRODUCTION"})
+
+logger = Logdna::Ruby.new('your-ingestion-key', options4)
+logger.log('4No metadata, no env')
+
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logdna
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gun Woo Choi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
-- !ruby/object:Gem::Dependency
-  name: openssl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +111,7 @@ files:
 - lib/logdna/resources.rb
 - lib/logdna/version.rb
 - logdna.gemspec
+- test.rb
 homepage: https://github.com/logdna/ruby
 licenses:
 - MIT
@@ -148,5 +135,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: LogDNA extension to ruby logger
+summary: LogDNA Ruby logger
 test_files: []