resurfaceio-logger 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8203412ccd551845453a39c74a9cf6cc577938c17baecd94f722bd5748aedb8e
-  data.tar.gz: 8df56d5c2e56183a347cb1777f8b94e4c71cc91777b3ffd8c2ecfa261952aa24
+  metadata.gz: '081b638ef0c63585d851de54a9b30ef9b54de58cf68f880785c2e1a8d214cb54'
+  data.tar.gz: a71c49ec92a27637f7d77b52177df39d0b197757a056154e5247f5e40aa350d1
 SHA512:
-  metadata.gz: f72e583b028aa00b092ff07be615f9a8628cc784b59a05678932bfa506da99a462b5ed233bdd10d81a00318ffab132bc9920925e250e4796da4e7d4b289453a4
-  data.tar.gz: 339c8ca8ee136ca575c428c44683bab7731c285d8a6319a8945038a24bf1ed2d6fd30c2aad3b592920929e91fc1dec2220497a6050cd898db419df3e57593f14
+  metadata.gz: f2f2c6be12c8977756ab185cc34c64cc29b0956940139315a1d9c023f4df0756cbea1c3fdb8eaab9207070ddda63ee1dac34688d8272d1782d5664b531de94a3
+  data.tar.gz: 8eed5ac226184687025edf8d3f213585b73d1577c8c6a5420f71b4bc5205add88470672e350746edef7e2a48bf3441276517fcb7ec176bdb16f88b21f9059c7a

data/lib/resurfaceio/base_logger.rb

@@ -4,6 +4,7 @@
 require 'uri'
 require 'net/http'
 require 'net/https'
+require 'socket'
 require 'zlib'
 require 'resurfaceio/usage_loggers'
 
@@ -11,6 +12,7 @@ class BaseLogger
 
   def initialize(agent, options = {})
     @agent = agent
+    @host = BaseLogger.host_lookup
     @skip_compression = false
     @skip_submission = false
     @version = BaseLogger.version_lookup
@@ -74,6 +76,10 @@ class BaseLogger
     @enabled && UsageLoggers.enabled?
   end
 
+  def host
+    @host
+  end
+
   def queue
     @queue
   end
@@ -94,11 +100,11 @@ class BaseLogger
     @skip_submission = value
   end
 
-  def submit(json)
-    if json.nil? || @skip_submission || !enabled?
+  def submit(msg)
+    if msg.nil? || @skip_submission || !enabled?
       true
     elsif @queue
-      @queue << json
+      @queue << msg
       true
     else
       begin
@@ -107,10 +113,10 @@ class BaseLogger
         @url_connection.use_ssl = @url.include?('https')
         request = Net::HTTP::Post.new(@url_parsed.path)
         if @skip_compression
-          request.body = json
+          request.body = msg
         else
           request.add_field('Content-Encoding', 'deflated')
-          request.body = Zlib::Deflate.deflate(json)
+          request.body = Zlib::Deflate.deflate(msg)
         end
         response = @url_connection.request(request)
         response.code.to_i == 204
@@ -129,6 +135,16 @@ class BaseLogger
     @version
   end
 
+  def self.host_lookup
+    dyno = ENV['DYNO']
+    return dyno unless dyno.nil?
+    begin
+      Socket.gethostname
+    rescue
+      'unknown'
+    end
+  end
+
   def self.version_lookup
     Gem.loaded_specs['resurfaceio-logger'].version.to_s
   end

data/lib/resurfaceio/http_logger.rb

@@ -116,6 +116,7 @@ class HttpLogger < BaseLogger
     # finish message
     details << ['now', now.nil? ? (Time.now.to_f * 1000).floor.to_s : now]
     details << ['agent', @agent]
+    details << ['host', @host]
     details << ['version', @version]
     JSON.generate details
   end

data/lib/resurfaceio/http_message.rb

@@ -7,9 +7,9 @@ class HttpMessage
 
   def self.build(request, response, response_body = nil, request_body = nil)
     message = []
-    append_value message, 'request_method', request.request_method
-    append_value message, 'request_url', request.url
-    append_value message, 'response_code', response.status
+    append_value message, 'request_method', request.request_method unless request.request_method.nil?
+    append_value message, 'request_url', request.url unless request.url.nil?
+    append_value message, 'response_code', response.status unless response.status.nil?
     append_request_headers message, request
     append_request_params message, request
     append_response_headers message, response

data/lib/resurfaceio/http_rules.rb

@@ -79,12 +79,12 @@ class HttpRules
   protected
 
   def self.parse_regex(r, regex)
-    str = parse_string(r, regex)
-    raise RuntimeError.new("Invalid regex (#{regex}) in rule: #{r}") if '*' == str || '+' == str || '?' == str
-    str = "^#{str}" unless str.start_with?('^')
-    str = "#{str}$" unless str.end_with?('$')
+    s = parse_string(r, regex)
+    raise RuntimeError.new("Invalid regex (#{regex}) in rule: #{r}") if '*' == s || '+' == s || '?' == s
+    s = "^#{s}" unless s.start_with?('^')
+    s = "#{s}$" unless s.end_with?('$')
     begin
-      return Regexp.compile(str)
+      return Regexp.compile(s)
     rescue RegexpError
       raise RuntimeError.new("Invalid regex (#{regex}) in rule: #{r}")
     end
@@ -98,15 +98,15 @@ class HttpRules
     end
   end
 
-  def self.parse_string(r, str)
+  def self.parse_string(r, expr)
     %w(~ ! % | /).each do |sep|
-      if (m = str.match(/^[#{sep}](.*)[#{sep}]$/))
+      if (m = expr.match(/^[#{sep}](.*)[#{sep}]$/))
         m1 = m[1]
         raise RuntimeError.new("Unescaped separator (#{sep}) in rule: #{r}") if m1.match(/^[#{sep}].*|.*[^\\][#{sep}].*/)
         return m1.gsub("\\#{sep}", sep)
       end
     end
-    raise RuntimeError.new("Invalid expression (#{str}) in rule: #{r}")
+    raise RuntimeError.new("Invalid expression (#{expr}) in rule: #{r}")
   end
 
   REGEX_ALLOW_HTTP_URL = /^\s*allow_http_url\s*(#.*)?$/.freeze

data/lib/resurfaceio/usage_loggers.rb

@@ -3,16 +3,16 @@
 
 class UsageLoggers
 
-  @@DISABLED = 'true'.eql?(ENV['USAGE_LOGGERS_DISABLE'])
+  @@BRICKED = 'true'.eql?(ENV['USAGE_LOGGERS_DISABLE'])
 
-  @@disabled = @@DISABLED
+  @@disabled = @@BRICKED
 
   def self.disable
     @@disabled = true
   end
 
   def self.enable
-    @@disabled = false unless @@DISABLED
+    @@disabled = false unless @@BRICKED
   end
 
   def self.enabled?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resurfaceio-logger
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - RobDickinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler