fluent-plugin-monolog 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87674206ea6024c2721003b3b8821b009677b647
-  data.tar.gz: 870040049fbeee7caec86dd36928123e8a844035
+  metadata.gz: 2b5f4b67970607199edc905626cd34d204e5c122
+  data.tar.gz: 66df80a1e127d6c20fbfbc1e99203da726925589
 SHA512:
-  metadata.gz: 9fd96fb63b6171b4d394cc28824dcf37513e846cabf57cf6739696ea5e4b6d7f73331f6c36d9f5781bda3337169cd10699ffc0600483b559b0d08bfff82f6c8f
-  data.tar.gz: 4fa7962507a3117389c968f086ed2dc863a27516ac09a45feae20532bfb8568f5f46748c7b52299c74f7f8e6b2e56af9dcff4f80a3513ace262585f12d307b7f
+  metadata.gz: 2adca0eb3cd94d6f95b34f2b3c4c571ca05092a68054e19db6355ca2c5e16c1ada222a94240142457516acafbbce4c82f2d4546c878f14f7f2b7191f5c232d16
+  data.tar.gz: efc333a79860925d78e8132c729cac25cfcb150ae716f323137b533a0ff9371e082b9d5d2adb71016af582334c325e2c07b437db4d3e38544682a7cbbcdf2262

data/README.md

@@ -19,7 +19,7 @@ We have an example for this plugin, so please use it.
 
 ## Usage
 
-After installed, please add configurations of [in_tail(tail Input Plugin)](http://docs.fluentd.org/v0.12/articles/in_tail) to `td-agent.conf`, like below.
+After installed, please add configurations of [in_tail(tail Input Plugin)](https://docs.fluentd.org/v0.14/articles/in_tail) to `td-agent.conf`, like below.
 
 ```
 # /etc/td-agent/td-agent.conf

data/fluent-plugin-monolog.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-monolog"
-  spec.version       = "0.1.8"
+  spec.version       = "0.2.0"
   spec.authors       = ["imunew"]
   spec.email         = ["imunew@gmail.com"]
 
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit", "~> 3.1"
-  spec.add_runtime_dependency "fluentd", "~> 0.12.0"
+  spec.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
 
 end

data/lib/fluent/plugin/parser_monolog.rb

@@ -1,50 +1,53 @@
+require 'fluent/plugin/parser'
 require 'json'
 
 module Fluent
-  class TextParser
-    class MonologParser < Parser
-      Fluent::Plugin.register_parser('monolog', self)
-
-      REGEXP = /^\[(?<time>[\d\-]+ [\d\:]+)\] (?<channel>.+)\.(?<level>(DEBUG|INFO|NOTICE|WARNING|ERROR|CRITICAL|ALERT|EMERGENCY))\: (?<message>[^\{\}]*) (?<context>(\{.+\})|(\[.*\])) (?<extra>(\{.+\})|(\[.*\]))\s*$/
-      TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
-
-      def initialize
-        super
-        @time_parser = TimeParser.new(TIME_FORMAT)
-        @mutex = Mutex.new
-      end
-
-      def patterns
-        {'format' => REGEXP, 'time_format' => TIME_FORMAT}
-      end
+  module Plugin
+    class TextParser
+      class MonologParser < Parser
+        Fluent::Plugin.register_parser('monolog', self)
+
+        REGEXP = /^\[(?<time>[\d\-]+ [\d\:]+)\] (?<channel>.+)\.(?<level>(DEBUG|INFO|NOTICE|WARNING|ERROR|CRITICAL|ALERT|EMERGENCY))\: (?<message>[^\{\}]*) (?<context>(\{.+\})|(\[.*\])) (?<extra>(\{.+\})|(\[.*\]))\s*$/
+        TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+
+        def initialize
+          super
+          @time_parser = TimeParser.new(TIME_FORMAT)
+          @mutex = Mutex.new
+        end
 
-      def parse(text)
-        m = REGEXP.match(text)
-        unless m
-          yield nil, nil
-          return
+        def patterns
+          {'format' => REGEXP, 'time_format' => TIME_FORMAT}
         end
 
-        time = m['time']
-        time = @mutex.synchronize { @time_parser.parse(time) }
-
-        channel = m['channel']
-        level = m['level']
-        message = m['message']
-        context = JSON.parse(m['context'])
-        extra = JSON.parse(m['extra'])
-
-        record = {
-            "channel" => channel,
-            "level" => level,
-            "message" => message,
-            "context" => context,
-            "extra" => extra
-        }
-        record["time"] = m['time'] if @keep_time_key
-
-        yield time, record
+        def parse(text)
+          m = REGEXP.match(text)
+          unless m
+            yield nil, nil
+            return
+          end
+
+          time = m['time']
+          time = @mutex.synchronize { @time_parser.parse(time) }
+
+          channel = m['channel']
+          level = m['level']
+          message = m['message']
+          context = JSON.parse(m['context'])
+          extra = JSON.parse(m['extra'])
+
+          record = {
+              "channel" => channel,
+              "level" => level,
+              "message" => message,
+              "context" => context,
+              "extra" => extra
+          }
+          record["time"] = m['time'] if @keep_time_key
+
+          yield time, record
+        end
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-monolog
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - imunew
@@ -56,16 +56,22 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '2'
 description: Fluentd parser plugin to parse log text from monolog
 email:
 - imunew@gmail.com