fluent-plugin-couch 0.2.0 → 0.3.0

data/Rakefile

@@ -6,13 +6,14 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "fluent-plugin-couch"
-    gemspec.summary = "CouchDB output plugin for Fluent event collector"
+    gemspec.summary = "CouchDB output plugin for Fluentd event collector"
     gemspec.author = "Yudai Odagiri"
     gemspec.email = "ixixizko@gmail.com"
-    gemspec.homepage = "http://github.com/fluent"
+    gemspec.homepage = "http://github.com/ixixi/fluent-plugin-couch"
     gemspec.has_rdoc = false
     gemspec.require_paths = ["lib"]
     gemspec.add_dependency "fluentd", "~> 0.10.0"
+    gemspec.add_dependency "couchrest", "~> 1.1.2"
     gemspec.test_files = Dir["test/**/*.rb"]
     gemspec.files = Dir["lib/**/*", "test/**/*.rb"] + %w[VERSION AUTHORS Rakefile]
     gemspec.executables = []

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/fluent/plugin/out_couch.rb

@@ -1,46 +1,5 @@
-
-module Couch
-    require 'net/http'
-    class Server
-        def initialize(host, port, options = nil)
-            @host = host
-            @port = port
-            @options = options
-        end
-
-        def delete(uri)
-            request(Net::HTTP::Delete.new(uri))
-        end
-
-        def get(uri)
-            request(Net::HTTP::Get.new(uri))
-        end
-
-        def put(uri, json)
-            req = Net::HTTP::Put.new(uri)
-            req["content-type"] = "application/json"
-            req.body = json
-            request(req)
-        end
-
-        def post(uri, json)
-            req = Net::HTTP::Post.new(uri)
-            req["content-type"] = "application/json"
-            req.body = json
-            request(req)
-        end
-
-        def request(req)
-            res = Net::HTTP.start(@host, @port) { |http|http.request(req) }
-            res
-        end
-
-    end
-end
-
 module Fluent
     class CouchOutput < BufferedOutput
-        
         include SetTagKeyMixin
         config_set_default :include_tag_key, false
 
@@ -48,16 +7,19 @@ module Fluent
         config_set_default :include_time_key, true
 
         Fluent::Plugin.register_output('couch', self)
-        
-        config_param :database, :string => nil do |val|
-            '/'+val
-        end
+
+        config_param :database, :string
+
         config_param :host, :string, :default => 'localhost'
         config_param :port, :string, :default => '5984'
 
+        config_param :refresh_view_index , :string, :default => nil
+
         def initialize
             super
+            Encoding.default_internal = 'UTF-8'
             require 'msgpack'
+            require 'couchrest'
         end
 
         def configure(conf)
@@ -66,8 +28,13 @@ module Fluent
 
         def start
             super
-            @couch = Couch::Server.new(@host, @port)
-            @couch.put(@database, "")
+            @db = CouchRest.database("http://#{@host}:#{@port}/#{@database}")
+            @views = []
+            unless @refresh_view_index.nil?
+                @db.get("_design/#{@refresh_view_index}")['views'].each do |view_name,func|
+                    @views.push([@refresh_view_index,view_name])
+                end
+            end
         end
 
         def shutdown
@@ -81,11 +48,15 @@ module Fluent
         def write(chunk)
             records = []
             chunk.msgpack_each {|record| records << record }
-            @couch.post(@database+'/_bulk_docs', {"all_or_nothing"=>true, "docs"=>records}.to_json)
+            @db.bulk_save(records)
+            update_view_index()
+        end
 
-            #for record in records
-            #    @couch.post(@database,record.to_json)
-            #end
+        def update_view_index()
+            @views.each do |design,view|
+                @db.view("#{design}/#{view}",{"limit"=>"0"})
+            end
         end
+
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-couch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000Z
+date: 2012-02-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70156152291940 !ruby/object:Gem::Requirement
+  requirement: &70210464681300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,18 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70156152291940
+  version_requirements: *70210464681300
+- !ruby/object:Gem::Dependency
+  name: couchrest
+  requirement: &70210464680780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70210464680780
 description: 
 email: ixixizko@gmail.com
 executables: []
@@ -34,7 +45,7 @@ files:
 - VERSION
 - lib/fluent/plugin/out_couch.rb
 - README.rdoc
-homepage: http://github.com/fluent
+homepage: http://github.com/ixixi/fluent-plugin-couch
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -57,5 +68,5 @@ rubyforge_project:
 rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
-summary: CouchDB output plugin for Fluent event collector
+summary: CouchDB output plugin for Fluentd event collector
 test_files: []