rack-logstash-writer 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2834072c7db69eee168bf9e594ab769700e5c5bc
-  data.tar.gz: 4ce942aa199028576f30d3835837e2e41577b662
+  metadata.gz: e3aada1afff771015b494f076de19c83084bb21e
+  data.tar.gz: 452c8a19da077cbc514e6215248aa76f6bf019b4
 SHA512:
-  metadata.gz: 5e60cec96a27abb6bcde2e7af3f3a9013cb2d9c16eaff20211bd5e4e7766d4a927f288cb34bfa6d4af2dfe52b5cbc912ed26b87fafb11b890d94a9ddd3606272
-  data.tar.gz: 851ff915b6f8e7b79b6614205221f4c46bf05f57dfe5b6c25d70955cd8b8524ebc1f4d33058c8d1dee4de653e4a9aecce39304ae1edefacc9eea461b0ae2cda4
+  metadata.gz: 780f10c76e20bd779caf400aedf518b472e41557f617cbb8d3369630f3533ead53e382f329abbf666a60554146b722db5743c5603f7f78f48a2fe47c6a9626fd
+  data.tar.gz: 5ac34507e109f17f643803f81d87974524e5adea95dda42d58d5298991fa689cdb2ff20ae969ea3b60ab61513a19d5b046902bf699064f99e8ed1e563e192f96

data/examples/regular rack file/config.ru

@@ -15,22 +15,14 @@ class JSONServerError
   end
 end
 
-prc = Proc.new do |env|
-  data = {}
-  if env["REMOTE_HOST"] =='localhost'
-    soc = Socket.ip_address_list.map {|s| s.ip_address}.reject {|s| s=='127.0.0.1'}.select {|s| 16 >(s.size) && (s.size)>10}.first
-    data[:host] = "ip-#{soc.gsub(".","-")}"
-  end
-  data[:service_name] = Dir.pwd.split("/").last
-  data
-end
+proc {|env| {service: Dir.pwd.split("/").last}}
 
 use Rack::LogstashWriter , {url: "file:///home/org/Desktop/logsample", # or another examples   "udp://localhost:5228" #  "tcp://localhost:5228"
     request_headers: {'head1'=>'head1'},
     response_headers: {'head1'=>'head1'},
     statuses: [*(500..600)] ,
     body_len: 50 ,
-    body_regex: {service_name: 'service_namev:(.*).*[,]?.*}' , proc: prc}
+    body_regex: {service_name: 'service_namev:(.*).*[,]?.*}' , proc: Proc.new {|env| {service: Dir.pwd.split("/").last}}}
 }
 
 map '/hello.json' do

data/examples/sinatra-project/config.ru

@@ -10,7 +10,7 @@ require ::File.expand_path('../lib/sinatra', __FILE__)
 prc = Proc.new {|env| p env}
 use Rack::LogstashWriter, {url: "tcp://localhost:5228" ,statuses: [*(200..600)], body_len: 100, response_headers: {'message' => 'This-is-a-message-man'},
                            request_headers: {'User-agent'=>'ua-nimrod'}, #"udp://localhost:5228" #   "file:///home/org/Desktop/logsample"
-                           body_regex: {service_name: 'service_namev:(.*).*[,]?.*}' , proc: prc}
+                           body_regex: {service_name: 'service_namev:(.*).*[,]?.*}' , proc: Proc.new {|env| {service: Dir.pwd.split("/").last}}}
 }
 
 run Sinatra::Application

data/lib/rack/logstash-writer/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class LogstashWriter
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

data/lib/rack/logstash-writer.rb

@@ -80,6 +80,11 @@ module Rack
 
       data[:error_msg] = env["sinatra.error"] if env.has_key?("sinatra.error")
 
+      if data[:host] =='localhost'
+        soc = Socket.ip_address_list.map {|s| s.ip_address}.reject {|s| s=='127.0.0.1'}.select {|s| 16 >(s.size) && (s.size)>10}.first
+        data[:host] = "ip-#{soc.gsub(".","-")}"
+      end
+
       @options[:body_regex].each { |k,v| data[k] = data[:body].to_s.match(/#{v}/).captures[0].gsub("\\","").gsub("\"","") rescue data[k]= "" } if !@options[:body_regex].nil?
 
       severity = "DEBUG"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstash-writer
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - or garfunkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake