fluent_logger_statistics 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab36c857fb64b4e55fb17480bc71863c3df96e5
-  data.tar.gz: 58b8b77224325b350cc7c920f9674b8e269441ec
+  metadata.gz: ed0b43301c6beb92978b77b3eee67f05c8b7c3da
+  data.tar.gz: 74e98587db73f9270ffe91b603c0477bb37b408f
 SHA512:
-  metadata.gz: 2d82123ef13982ec3309e80acb511dbbf3b7531be6d5644c400545a1060b19cffa73132f200afd77b76b443d3971b0baa70b84c19a129d7e52d3ddb0f6d81d5b
-  data.tar.gz: fdc51c1544c704a517b08046528b9126c1b95f6cef6725a6efd6866f3021eb8c249fe4439ceff4195d6578f5555a5cfd757156b7f6b6d42b96963f0b104fb83a
+  metadata.gz: b12299eea163d97ced0722126efe21c0d5772a88d578e03359fa417d72c7d16575ff0de1f5e01949c72747b9a706eeb88f7d44a6ae9cb413baa2c1a6d97942e9
+  data.tar.gz: 1c086a9aba069c80b9f3b004c4e04dbcbbcd81cbe5fe553d8e218d043c2be65dd7e3c5622c7e18691e59d41d546c0c819c908900cc2480a4e69c049f4205e6f5

data/README.md

@@ -6,7 +6,7 @@
 Middleware settings:
 ```ruby
 Rails.configuration.middleware.use FluentLoggerStatistics::Middleware,
-  '/endpoint',
+  '/endpoint/',
   {
     resource_name1: fluent_logger1, # instance of Fluent::Logger::FluentLogger
     resource_name2: fluent_logger2,
@@ -14,11 +14,19 @@ Rails.configuration.middleware.use FluentLoggerStatistics::Middleware,
   }
 ```
 
-After rails boot, then
+After rails boots, then
 ```sh
-$ curl http://rails-host/endpoint/resource_name1 # no buffer used
-{"buffer_bytesize":0,"buffer_limit":8388608,"buffer_usage_rate":0.0}
-
-$ curl http://rails-host/endpoint/resource_name2 # buffered
-{"buffer_bytesize":236,"buffer_limit":8388608,"buffer_usage_rate":2.8133392333984375e-05}
+$ curl http://rails-host/endpoint | jq .
+{
+  "resource_name1": {
+    "buffer_bytesize": 0,
+    "buffer_limit": 8388608,
+    "buffer_usage_rate": 0
+  },
+  "resource_name2": {
+    "buffer_bytesize": 236,
+    "buffer_limit": 8388608,
+    "buffer_usage_rate": 2.8133392333984375e-05
+  }
+}
 ```

data/lib/fluent_logger_statistics/app.rb

@@ -2,8 +2,8 @@ module FluentLoggerStatistics
   class App
     include Rack::Utils
 
-    def initialize(fluent_logger)
-      @fluent_logger = fluent_logger
+    def initialize(fluent_loggers)
+      @fluent_loggers = fluent_loggers
     end
 
     ACCEPT_METHODS = ['GET'].freeze
@@ -16,16 +16,18 @@ module FluentLoggerStatistics
       status = 200
       header = {'Content-Type' => 'application/json'}
 
-      bytesize = @fluent_logger.pending_bytesize
-      limit = @fluent_logger.limit
-      usage_rate = bytesize / limit.to_f
-
-      body = [
-        { buffer_bytesize: bytesize,
-          buffer_limit: limit,
+      stats = @fluent_loggers.map{|k,v|
+        bytesize = v.pending_bytesize
+        limit_bytesize = v.limit
+        usage_rate = bytesize / limit_bytesize.to_f
+        [k, {
+          buffer_bytesize: bytesize,
+          buffer_limit: limit_bytesize,
           buffer_usage_rate: usage_rate
-        }.to_json
-      ]
+        }]
+      }.to_h
+
+      body = [ stats.to_json ]
 
       [status, header, body]
     end

data/lib/fluent_logger_statistics/middleware.rb

@@ -2,20 +2,17 @@ require "fluent_logger_statistics/app"
 
 module FluentLoggerStatistics
   class Middleware
-    def initialize(app, endpoint, loggers)
+    def initialize(app, path, loggers)
       @app = app
-      @fluent_apps = loggers.map{|resource, logger|
-        path = [ endpoint.chomp('/'), resource ].join('/')
-        [ path, App.new(logger) ]
-      }.to_h
+      @path = path
+      @fluent_app = App.new(loggers)
     end
 
     ACCEPT_METHODS = ['GET'].freeze
 
     def call(env)
-      path = env['PATH_INFO'].chomp('/')
-      if @fluent_apps[path] && ACCEPT_METHODS.include?(env['REQUEST_METHOD'])
-        @fluent_apps[path].call(env)
+      if env['PATH_INFO'] == @path && ACCEPT_METHODS.include?(env['REQUEST_METHOD'])
+        @fluent_app.call(env)
       else
         @app.call(env)
       end

data/lib/fluent_logger_statistics/version.rb

@@ -1,3 +1,3 @@
 module FluentLoggerStatistics
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent_logger_statistics
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Takuya Kosugiyama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler