rack-logstash-writer 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff2b86195cfeda0d8087a23d4ea91059993c0a1
-  data.tar.gz: 35fcf1f76924d92d67534730151bceb9a21f8603
+  metadata.gz: 2834072c7db69eee168bf9e594ab769700e5c5bc
+  data.tar.gz: 4ce942aa199028576f30d3835837e2e41577b662
 SHA512:
-  metadata.gz: 518508d1c5acf891ded2773f8139286992c751f2269b7e782e73385e56c11f2d65ec2348c676f49fe720e4ff92544da092e5d8822ba3b997537bf748d6c4002e
-  data.tar.gz: 8f539024bc70c3e191f12e3817fff186ba7cdbad2b6b63555b15e8ec665f3e972db319bb9003fdd1840813a326db86c1895cd54f1e14bd3657715340a1e46c43
+  metadata.gz: 5e60cec96a27abb6bcde2e7af3f3a9013cb2d9c16eaff20211bd5e4e7766d4a927f288cb34bfa6d4af2dfe52b5cbc912ed26b87fafb11b890d94a9ddd3606272
+  data.tar.gz: 851ff915b6f8e7b79b6614205221f4c46bf05f57dfe5b6c25d70955cd8b8524ebc1f4d33058c8d1dee4de653e4a9aecce39304ae1edefacc9eea461b0ae2cda4

data/README.md

@@ -35,6 +35,7 @@ use Rack::LogstashWriter , {url: "file:///home/org/Desktop/logsample", # require
     statuses: [*(500..600)], # optional, send events to log stash only for those statuses. default [*(500..600)] 
     body_len: 50 # optional, include the first given chars from the body. default 1000
     body_regex: {:name_to_show => 'regex'}, include the regular expression from the body
+    proc: {|env| p "#{env}"}, enter proc, the proc will get the env as variable and merge the retuened data if it return as hash 
     }
     
 run Proc.new {[200, {"Content-Type" => "application/json"}, ['{ "message" : "Hello!" }']]}

data/examples/regular rack file/config.ru

@@ -15,12 +15,22 @@ 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
+
 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:(.*).*[,]?.*}' }
+    body_regex: {service_name: 'service_namev:(.*).*[,]?.*}' , proc: prc}
 }
 
 map '/hello.json' do

data/examples/sinatra-project/config.ru

@@ -7,9 +7,10 @@ require ::File.expand_path('../lib/sinatra', __FILE__)
 
 # use Rails::Rack::Debugger
 # use Rack::ContentLength
+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:(.*).*[,]?.*}' }
+                           body_regex: {service_name: 'service_namev:(.*).*[,]?.*}' , proc: prc}
 }
 
 run Sinatra::Application

data/lib/rack/logstash-writer.rb

@@ -12,10 +12,12 @@ module Rack
     # @option options [Hash] :response_headers, optional, parameters to add to the report from the responce headers. default nil
     # @option options [Fixnum] :body_len, optional, include the first given chars from the body. default 1000
     # @option options [Array] :statuses, optional, send events to log stash only for those statuses. default [*(500..600)]
+    # @option options [Proc] :proc, optional, the function will call the proc with the env and call
     def initialize app, options = {} #, statuses = [*(500..600)] , body_len = 1000 , url
       @app = app
       @options = validate defaults.merge options
       @options[:url]= URI(@options[:url])
+      @proc = @options[:proc]
     end
 
     # Call to the app cal and log if the returned status is in the array of return data.
@@ -62,13 +64,13 @@ module Rack
           :duration => (Time.now - began_at),
           :remote_addr => env['REMOTE_ADDR'],
           :request => request_line(env),
-          :service_name => Dir.pwd.split("/").last ,
           :"X-Forwarded-For" => response_headers['X-Forwarded-For']
       }
 
-      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(".","-")}"
+      # Added calling for the proc and merge the data if it exists
+      if @proc
+        new_hash = @proc.call(env)
+        data = data.merge new_hash if new_hash.class == Hash
       end
 
       # This just works for all body types (magic?)... see http://www.rubydoc.info/github/rack/rack/Rack/BodyProxy
@@ -86,11 +88,9 @@ module Rack
         when 400..599 then severity = "ERROR"
       end
       event = {:severity => severity}.merge data
-      # logger.puts({'@fields' => data, '@tags' => ['request'], '@timestamp' => ::Time.now.utc, '@version' => 23})
       # TODO to include this lines
       begin
         device.puts( event.to_json )
-      # rescue Errno::EPIPE, Errno::EINVAL
       rescue Exception => e
         STDERR.puts "Error : Failed to write log to : #{@options[:url]}, #{e.message}."
         @device = nil

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

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

metadata

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