fluent-plugin-light-core 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6963e9c755b56d0c56eb2efe8d5144b66ea1463dd826c90ab71f5b65a72f37
-  data.tar.gz: f37743b84fc9a68940c488e06903a71725ffbb14a0a7a02c2203a19074f22940
+  metadata.gz: a553d56fc47ba8c7ae49428e3d60a5180bb90a9d3b355ebec22b6983265249a9
+  data.tar.gz: b27775457e6b5cea4f80a6d83095460ef2d59087648ef683331615a90e4a2fce
 SHA512:
-  metadata.gz: 2d3fb8390aaf781220b4e288819c1f14c063a50c58ea850ef8b55ae63005ed3db03653b7e81f6cf349cfac04ca5259c2a4e2c73ec83003ed8290fefe9e187c1b
-  data.tar.gz: b89a10c9a2581a781536e06f4b7285c066ef1ec73f4a033bd646c7c2759e9de00a2a5227a5afa98ec406737390fd37c2212086a4cf33ccd7cab3addac4ec4787
+  metadata.gz: 69e2cf2089fb5be1cc62fcdbe86498b1711c0e5bea39767044d9b3e2e853026ec9a0f122609c05b79e57e58f6d74f7fc924563e56526d9ecdde61ec4631dde27
+  data.tar.gz: e384dadbc0567ac19f7013209aa43441981c0aedb85bfa9381b86118422956b839d218b6a2b8083dc5ae9af93ed503d8ecc181afae6de952e148fff1d640bf4c

data/fluent-plugin-light-core.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-light-core"
-  spec.version = "0.2.2"
+  spec.version = "0.2.3"
   spec.authors = ["LIN LI"]
   spec.email   = ["l.li@alphabets.cn"]
 

data/lib/fluent/plugin/filter_light_core.rb

@@ -131,9 +131,9 @@ module Fluent
           record['method'] = item[:method]
           record['url'] = item[:url]
           record['status'] = item[:status]
-          record['size'] = format_str(item[:size])
+          record['size'] = str_to_num(item[:size])
           record['uid'] = item[:uid]
-          record['elapsed'] = format_str(item[:elapsed])
+          record['elapsed'] = str_to_num(item[:elapsed])
           record['addr'] = item[:addr].gsub(/\n$/, '')
 
           return record
@@ -170,10 +170,10 @@ module Fluent
           record['method'] = item[:method]
           record['path'] = item[:path]
           record['code'] = item[:code]
-          record['size'] = format_str(item[:size])
+          record['size'] = str_to_num(item[:size])
           record['referer'] = item[:referer]
           record['agent'] = item[:agent]
-          record['elapsed'] = format_str(item[:elapsed])
+          record['elapsed'] = str_to_num(item[:elapsed])
           record['requestid'] = item[:requestid]
           record['sessionid'] = item[:sessionid]
 
@@ -184,7 +184,7 @@ module Fluent
         if /^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2} \[error\]/.match(log)
           item = /^(?<time>[^ ]+ [^ ]+) \[(?<level>.*)\] (?<pid>\d*)#(?<tid>[^:]*): \*(?<cid>\d*) (?<message>.*)$/.match(log)
 
-          record['time'] = item[:time]
+          record['time'] = record['ctime']
           record['level'] = item[:level]
           record['message'] = item[:message]
           record['process'] = item[:pid]     # process id
@@ -225,61 +225,26 @@ module Fluent
         record.delete('file')
         record.delete('time')
 
-        # 旧版本日志格式解析
-        if /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}\+\d{4} [A-Z]/.match(log)
-
-          item = /^(?<time>[^ ]*) (?<severity>[A-Z])\s* (?<component>(-|([^ ]*)))\s* \[(?<context>[^\]]*)\]\s* ((?<query>.*) protocol:op_query (?<querytime>[\d\.]+(?=ms))|(?<message>.*))/.match(log)
-
-          record['time'] = item[:time]
-          record['severity'] = item[:severity]
-          record['component'] = item[:component]
-          record['context'] = item[:context]
-
-          if item[:message]
-            record['message'] = item[:message]
-            return record
-          end
-
-          if item[:querytime]
-            record['querytime'] = format_str(item[:querytime])
-          end
-
-          if item[:query]
-            record['command'] = item[:query]
-            query = /^command\s* (?<collection>[^ ]*) (?<command>.*)$/.match(item[:query])
-            unless query.nil?
-              record['collection'] = query[:collection]
-              record['command'] = query[:command]
-            end
-          end
-          
-          return record
-        else
-
-          # 版本4.4开始，默认日志为json格式
-          item = JSON.parse(log)
-          record['time'] = item['t']['$date']
-          record['severity'] = item['s']
-          record['component'] = item['c']
-          record['context'] = item['ctx']
-          record['identifier'] = item['id']
-          record['message'] = item['msg']
-
-          attributes = item['attr']
-          if attributes
-            record['querytime'] = attributes['durationMillis']
-            record['collection'] = attributes['ns']
-            record['command'] = attributes['command']
-            record['attr'] = attributes
-          end
-
-          record['tags'] = item['tags']
-          record['truncated'] = item['truncated']
-          record['size'] = item['size']
-        
-          return record
+        # 版本4.4开始，默认日志为json格式
+        item = JSON.parse(log)
+        record['time'] = item['t']['$date']
+        record['severity'] = item['s']
+        record['component'] = item['c']
+        record['context'] = item['ctx']
+        record['identifier'] = item['id']
+        record['message'] = item['msg']
+
+        attributes = item['attr']
+        if attributes
+          record['querytime'] = attributes['durationMillis']
+          record['collection'] = attributes['ns']
+          record['command'] = attributes['command']
+          record['attr'] = attributes
         end
 
+        record['tags'] = item['tags']
+        record['truncated'] = item['truncated']
+        record['size'] = item['size']
         record
       end
 
@@ -292,16 +257,14 @@ module Fluent
 
         if tag == 'app'
 
-          # 未使用
           if @app_stream && record['stream']
-            send(record) if record['stream'] == @app_stream
+            send(tag, record['message'], record) if record['stream'] == @app_stream
           end
 
-          # 未使用
           if @app_message.length > 0 && record['message']
             @app_message.each do |pattern|
               if pattern.match(record['message'])
-                send(record)
+                send(tag, record['message'], record)
                 break
               end
             end
@@ -369,7 +332,8 @@ module Fluent
       end
 
       # 转数字
-      def format_str(str)
+      def str_to_num(str)
+        return 0 if (str == '-')
         return str.to_i if (str =~ /^\d+$/)
         return str.to_f if (str =~ /^\d+\.\d+$/)
         str

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-light-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - LIN LI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler