magellan-log-funnel 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3a179d70b7b8be45d9247c5e3216336d17f7d34
-  data.tar.gz: be0d89ab8429793a2d38d99b6f95b375573c6868
+  metadata.gz: c10cb12e8f780943e7fc6743276b935339165cc8
+  data.tar.gz: 7711739985ccf9e48a3152009aa86df2edf293be
 SHA512:
-  metadata.gz: 154b0f07392802f3a2cacd02ec2e623ebfc3b3f19d0dfaaad07b182c915ded0eb89da43f8900023ce17e89d3519a9edd451541ad7b1a6fe3bd43eced8b829865
-  data.tar.gz: 398bd67a2cce0efa416c9c9dc6364f22adb4d4f8d90b93d760d727203fca24ad15749fbe19c8dd8aa9fcefbb4e0db028037414f263ec61cb314e4c3fb4207e46
+  metadata.gz: c029faddb6a24180f423f41d9d1b6fee7fe09451ddf872f5843b4d4ccd9d77ca4632d8ddbd4eb9d9dafe05e6fceab4b695b541bbc59a35d734a04a2ff4473df6
+  data.tar.gz: 17a533b02c8d89a99afa5d8615c3759929e072fa528e2c8b66ffef302d06ba82f95648e3573c0d3850ed123731d7e42beb270f4c1d6fabd130e6cb8f045031b5

data/Gemfile

@@ -1,5 +1,7 @@
 source "https://rubygems.org/"
 
+gemspec
+
 group :development, :test do
-  gem "rspec", "~> 3.0.0" 
+  gem "rspec", "~> 3.0.0"
 end

data/Gemfile.lock

@@ -1,7 +1,18 @@
+PATH
+  remote: .
+  specs:
+    magellan-log-funnel (1.1.0)
+      fluent-logger (~> 0.4.9)
+
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
+    fluent-logger (0.4.10)
+      msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
+      yajl-ruby (~> 1.0)
+    msgpack (0.5.11)
+    rake (10.4.2)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
@@ -14,9 +25,13 @@ GEM
     rspec-mocks (3.0.4)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
+    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (~> 1.6)
+  magellan-log-funnel!
+  rake (~> 10.0)
   rspec (~> 3.0.0)

data/lib/magellan/log_funnel/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   class LogFunnel
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/magellan/log_funnel.rb

@@ -3,6 +3,7 @@
 require "json"
 require "optparse"
 require "net/http"
+require "fluent/logger"
 
 module Magellan
   class LogFunnel
@@ -43,25 +44,33 @@ module Magellan
       end
     end
 
+    def connect_fluentd
+      @logger = Fluent::Logger::FluentLogger.new("worker_logs")
+    end
+
     def now
       Time.now
     end
 
+    def stage_tag
+      @stage_tag ||= "#{@conf[:project]}.#{@conf[:stage]}"
+    end
+
     def post_msg(msg)
-      Net::HTTP.post_form(@conf[:fluentd], json: JSON.generate({
-        time: self.now.to_i,
+      @logger.post(stage_tag, {
+        time: self.now.to_f,
         project: @conf[:project],
         stage: @conf[:stage],
         version: @conf[:version],
         container: @conf[:container],
         message: msg
-      }))
+      })
     end
 
     def run
       parse_options(@argv)
-      @conf[:fluentd] ||= URI("http://localhost:8888")
-      @conf[:fluentd].path = "/worker_logs.#{@conf[:project]}.#{@conf[:stage]}"
+
+      connect_fluentd
 
       if @conf[:daemon]
         Process.daemon

data/magellan-log-funnel.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "fluent-logger", "~> 0.4.9"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

data/spec/magellan/log_funnel_spec.rb

@@ -14,17 +14,19 @@ describe Magellan::LogFunnel do
     # stub Net::HTTP.post_form
     @now = Time.now
     allow(@funnel).to receive(:now).and_return(@now)
-    expect(Net::HTTP).to receive(:post_form).with(URI("http://fluentd.example:8888/worker_logs.PROJECT1.STAGE1"),
-                                                  json: JSON.generate({
-      time: @now.to_i,
+    @test_logger = Fluent::Logger::TestLogger.new
+    expect(Fluent::Logger::FluentLogger).to receive(:new).and_return(@test_logger)
+  end
+  it 'can handle stdout' do
+    expect(@funnel.run).to eql(0)
+    expect(@test_logger.queue.count).to eql(1)
+    expect(@test_logger.queue.last).to eql({
+      time: @now.to_f,
       project: "PROJECT1",
       stage: "STAGE1",
       version: "1.0",
       container: "CONTAINER1",
       message: "foo"
-    }))
-  end
-  it 'can handle stdout' do
-    expect(@funnel.run).to eql(0)
+    })
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: magellan-log-funnel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - t-chikanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fluent-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: log collector for magellanic cloud service.