fluent-plugin-heroku-postgres 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1fc6e06906c84a2db95ebd2e83abf10ef08b741
-  data.tar.gz: b692260d42c77b31576f243a09b6dec79a76b6b1
+  metadata.gz: 8ecf7d3ef69df838b352ea889c49c71b25a94a96
+  data.tar.gz: e0741e2ccc67340a3dadb2749aa533de42af8457
 SHA512:
-  metadata.gz: bf64e8dd32d67b48c8feca4d57d0199aefb1498b1884b74a796d0fb6a54e18b4ab7f779b80860281231f6501bf7397d3e471dd655ef7cfcf1d00c6136eeae70f
-  data.tar.gz: 85b61854e18cb6ccb9d1559026adc5323cfecf669b8fe0c96bebfc9503e82d618afd377e60d3ab58f6231fb8c70ad2c9587ebd5d624f85ed5cd4437afae5d377
+  metadata.gz: 5b9fc5a2003b82543053a609bd575c99e43c127641bcbe18028af7b226e858c6b4bc89e8f3626853ab4652b70827ebaad20a5079cc5a233a7a48b96f09de023d
+  data.tar.gz: 763addc1eb379dc106a55ab6780e5ff43386e9bbc2cd93f9fafb99a6507bd24acc5af423c13bf1037c57b1a0c2b8c5f2305ced564ed0995587f02f6274f05329

data/README.md

@@ -1,6 +1,6 @@
-# Fluent::Plugin::Heroku::Postgres
+# Fluentd Plugin for Heroku Postgres
 
-TODO: Write a gem description
+td-agent on Heroku.
 
 ## Installation
 
@@ -12,13 +12,32 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+## Usage
 
-    $ gem install fluent-plugin-heroku-postgres
+* example
 
-## Usage
+### td-agent-conf.rb
+
+※  Not 'td-agent.conf'
+
+```ruby
+# td-agent-conf.rb
+
+match('postgres.**') {
+  type :heroku_postgres
+
+  heroku_postgres_url "#{::ENV['DATABASE_URL']}"
+  key_names 'name'
+  sql "INSERT INTO vendors (name) VALUES ($1)"
+}
+```
+
+### Procfile
+
+```
+web: bundle exec fluentd -c td-agent-conf.rb -i "source { type :http; port $PORT }" -vv
+```
 
-TODO: Write usage instructions here
 
 ## Contributing
 

data/fluent-plugin-heroku-postgres.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fluent/plugin/heroku/postgres/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-heroku-postgres"
-  spec.version       = Fluent::Plugin::Heroku::Postgres::VERSION
+  spec.version       = '0.0.3'
   spec.authors       = ["Naohiro Sakuma"]
   spec.email         = ["nao.bear@gmail.com"]
   spec.summary       = %q{fluent plugin to insert on Heroku Postgre.}
@@ -18,6 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'fluentd', "~> 0.10"
+  spec.add_dependency 'pg', "~> 0.17"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", '~> 0'
+  spec.add_development_dependency "pry", '~> 0'
 end

data/lib/fluent/plugin/out_heroku_postgres.rb

@@ -0,0 +1,85 @@
+class Fluent::HerokuPostgresOutput < Fluent::BufferedOutput
+  Fluent::Plugin.register_output('heroku_postgres', self)
+
+  include Fluent::SetTimeKeyMixin
+  include Fluent::SetTagKeyMixin
+
+  attr_accessor :host, :port, :database, :username, :password
+
+  config_param :heroku_postgres_url, :string
+
+  config_param :key_names, :string, :default => nil # nil allowed for json format
+  config_param :sql, :string, :default => nil
+  config_param :table, :string, :default => nil
+  config_param :columns, :string, :default => nil
+
+  config_param :format, :string, :default => "raw" # or json
+
+  attr_accessor :handler
+
+  def initialize
+    super
+    require 'pg'
+  end
+
+  # We don't currently support mysql's analogous json format
+  def configure(conf)
+    super
+
+    parse_heroku_postgres_url!
+
+    if @format == 'json'
+      @format_proc = Proc.new{|tag, time, record| record.to_json}
+    else
+      @key_names = @key_names.split(',')
+      @format_proc = Proc.new{|tag, time, record| @key_names.map{|k| record[k]}}
+    end
+
+    if @columns.nil? and @sql.nil?
+      raise Fluent::ConfigError, "columns or sql MUST be specified, but missing"
+    end
+    if @columns and @sql
+      raise Fluent::ConfigError, "both of columns and sql are specified, but specify one of them"
+    end
+  end
+
+  def start
+    super
+  end
+
+  def shutdown
+    super
+  end
+
+  def format(tag, time, record)
+    [tag, time, @format_proc.call(tag, time, record)].to_msgpack
+  end
+
+  def client
+    PG::Connection.new({
+      :host => @host, :port => @port,
+      :user => @username, :password => @password,
+      :dbname => @database
+    })
+  end
+
+  def write(chunk)
+    handler = self.client
+    handler.prepare("write", @sql)
+    chunk.msgpack_each { |tag, time, data|
+      handler.exec_prepared("write", data)
+    }
+    handler.close
+  end
+
+  private
+
+  def parse_heroku_postgres_url!
+    parsed_url = URI.parse(@heroku_postgres_url)
+    @host = parsed_url.host
+    @port = parsed_url.port
+    @database = parsed_url.path.sub(/\//, '')
+    @username = parsed_url.user
+    @password = parsed_url.password
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-heroku-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Naohiro Sakuma
@@ -10,6 +10,34 @@ bindir: bin
 cert_chain: []
 date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fluentd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is fluent plugin to insert on Heroku Postgre.
 email:
 - nao.bear@gmail.com
@@ -51,8 +93,7 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-heroku-postgres.gemspec
-- lib/fluent/plugin/heroku/postgres.rb
-- lib/fluent/plugin/heroku/postgres/version.rb
+- lib/fluent/plugin/out_heroku_postgres.rb
 homepage: https://github.com/n-sakuma/fluent-plugin-heroku-postgres
 licenses:
 - MIT

data/lib/fluent/plugin/heroku/postgres.rb

@@ -1,11 +0,0 @@
-require "fluent/plugin/heroku/postgres/version"
-
-module Fluent
-  module Plugin
-    module Heroku
-      module Postgres
-        # Your code goes here...
-      end
-    end
-  end
-end

data/lib/fluent/plugin/heroku/postgres/version.rb

@@ -1,9 +0,0 @@
-module Fluent
-  module Plugin
-    module Heroku
-      module Postgres
-        VERSION = "0.0.1"
-      end
-    end
-  end
-end