fluent-plugin-couch 0.3.6 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0

data/lib/fluent/plugin/out_couch.rb

@@ -2,23 +2,26 @@ module Fluent
     class CouchOutput < BufferedOutput
         include SetTagKeyMixin
         config_set_default :include_tag_key, false
-
+        
         include SetTimeKeyMixin
         config_set_default :include_time_key, true
-
+        
         Fluent::Plugin.register_output('couch', self)
-
+        
         config_param :database, :string
-
+        
         config_param :host, :string, :default => 'localhost'
         config_param :port, :string, :default => '5984'
         config_param :protocol, :string, :default => 'http'
-
+        
         config_param :refresh_view_index , :string, :default => nil
         
         config_param :user, :string, :default => nil
         config_param :password, :string, :default => nil
-
+        
+        config_param :update_docs, :bool, :default => false
+        config_param :doc_key_field, :string, :default => nil
+        
         def initialize
             super
             
@@ -27,50 +30,68 @@ module Fluent
             require 'couchrest'
             Encoding.default_internal = 'ASCII-8BIT'
         end
-
+        
         def configure(conf)
             super
         end
-
+        
         def start
             super
-            if @user && @password
-                @db = CouchRest.database!("#{@protocol}://#{@user}:#{@password}@#{@host}:#{@port}/#{@database}")
-            else
-                @db = CouchRest.database!("#{@protocol}://#{@host}:#{@port}/#{@database}")
-            end
+            account = "#{@user}:#{@password}@" if @user && @password 
+            @db = CouchRest.database!("#{@protocol}://#{account}#{@host}:#{@port}/#{@database}")
             @views = []
             if @refresh_view_index
                 begin
                     @db.get("_design/#{@refresh_view_index}")['views'].each do |view_name,func|
                         @views.push([@refresh_view_index,view_name])
                     end
-                rescue
+                    rescue
                     puts 'design document not found!'
                 end
             end
         end
-
+        
         def shutdown
             super
         end
-
+        
         def format(tag, time, record)
             record.to_msgpack
         end
-
+        
         def write(chunk)
             records = []
-            chunk.msgpack_each {|record| records << record }
-            @db.bulk_save(records)
-            update_view_index()
+            chunk.msgpack_each {|record|
+                record['_id'] = record[@doc_key_field] unless @doc_key_field.nil?
+                records << record
+            }
+            unless @update_docs
+                @db.bulk_save(records)
+                else
+                update_docs(records)
+            end
+            update_view_index
         end
-
+        
+        def update_docs(records)
+            if records.length > 0
+                records.each{|record|
+                    doc = nil
+                    begin
+                        doc = @db.get(record['_id'])
+                        rescue
+                    end
+                    record['_rev']=doc['_rev'] unless doc.nil?
+                    puts record
+                    @db.save_doc(record) 
+                }
+            end
+        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.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70198091437320 !ruby/object:Gem::Requirement
+  requirement: &70267577807740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198091437320
+  version_requirements: *70267577807740
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &70198091436720 !ruby/object:Gem::Requirement
+  requirement: &70267577806360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70198091436720
+  version_requirements: *70267577806360
 description: 
 email: ixixizko@gmail.com
 executables: []