fluentd 0.10.27 → 0.10.28

data/ChangeLog

@@ -1,4 +1,10 @@
 
+Release 0.10.28 - 2012/10/30
+
+* in_http: on_request method can get headers as HTTP_* key and remote address
+  as REMOTE_ADDR key of the params argument
+
+
 Release 0.10.27 - 2012/10/11
 
 * added BufferChunk#unique_id which is an unique identifier of a buffered chunk

data/VERSION

@@ -1 +1 @@
-0.10.27
+0.10.28

data/lib/fluent/plugin/in_http.rb

@@ -148,6 +148,8 @@ class HttpInput < Input
 
       @idle = 0
       @km.add(self)
+
+      @remote_port, @remote_addr = *Socket.unpack_sockaddr_in(io.getpeername)
     end
 
     def step_idle
@@ -183,7 +185,9 @@ class HttpInput < Input
       else
         @keep_alive = false
       end
+      @env = {}
       headers.each_pair {|k,v|
+        @env["HTTP_#{k.gsub('-','_').upcase}"] = v
         case k
         when /Expect/i
           expect = v
@@ -225,6 +229,8 @@ class HttpInput < Input
     def on_message_complete
       return if closing?
 
+      @env['REMOTE_ADDR'] = @remote_addr
+
       params = WEBrick::HTTPUtils.parse_query(@parser.query_string)
 
       if @content_type =~ /^application\/x-www-form-urlencoded/
@@ -237,6 +243,9 @@ class HttpInput < Input
       end
       path_info = @parser.request_path
 
+      params.merge!(@env)
+      @env.clear
+
       code, header, body = *@callback.call(path_info, params)
       body = body.to_s
 

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.27'
+VERSION = '0.10.28'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.27
+  version: 0.10.28
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -165,7 +165,6 @@ executables:
 extensions: []
 extra_rdoc_files:
 - ChangeLog
-- README
 - README.rdoc
 files:
 - AUTHORS
@@ -245,7 +244,6 @@ files:
 - test/plugin/out_stdout.rb
 - test/plugin/out_stream.rb
 - ChangeLog
-- README
 - README.rdoc
 homepage: http://fluentd.org/
 licenses: []

data/README

@@ -1,65 +0,0 @@
-= Fluent
-
-Fluent is an event collector system. It's said that Fluent is generalized version of syslogd, which can deal with JSON object for the log message.
-
-== Archtecture
-
-Fluent collects events from various data sources and write them to files, database or other storages:
-
-    
-    Web apps  ---+                 +--> file
-                 |                 |
-                 +-->           ---+
-    /var/log  ------>  fluentd  ------> mail
-                 +-->           ---+
-                 |                 |
-    apache    ----                 +--> fluentd
-    
-
-Fluent also supports log transfer:
-
-    
-    Web server
-    +---------+
-    | fluentd -------
-    +---------+|     |
-     +---------+     |
-                     |
-    Proxy server     |    Log server, Amazon S3, HDFS, ...
-    +---------+      +--> +---------+
-    | fluentd ----------> | fluentd ||
-    +---------+|     +--> +---------+|
-     +---------+     |     +---------+
-                     |
-    Database server  |
-    +---------+      |
-    | fluentd ---------> mail
-    +---------+|
-     +---------+
-    
-
-An event consists of *tag*, *time* and *record*. Tag is a string separated with '.' (e.g. myapp.access). It is used to categorize events. Time is a UNIX time when the event occurs. Record is a JSON object.
-
-
-== Quick Start
-
-  $ gem install fluentd
-  $ fluentd &
-  $ echo '{"json":"message"}' | fluent-cat debug.test
-
-== Meta
-
-Web site::  http://fluentd.org/
-Documents:: http://fluentd.org/doc/
-Source repository:: http://github.com/fluent
-Author:: Sadayuki Furuhashi
-Copyright:: (c) 2011 FURUHASHI Sadayuki
-License:: Apache License, Version 2.0
-
-Contributed by:
-
-* Eiichiro Iwata
-* Masahiro Nakagawa
-* Takashi Nagayasu
-* Yuichi Tateno
-