groonga-log 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c2b0dd7415f688f09579a0fb4752211d62544e1d
-  data.tar.gz: 903b02ac19642629d43cf10a3cd7d8e71ed55e08
+SHA256:
+  metadata.gz: 25c1995a063dec899eb5fa204533eb9df494b2dd2cde06e4abb05cc1580ae0cc
+  data.tar.gz: 641bb221339794c6d122b103b8c93a8920277690672d71e5a101ac3c1eb39764
 SHA512:
-  metadata.gz: e02339c0d2717f2fb064cb3ec61e6c3d9388e8f191a5e03d5efd799b156191a1b3f34982a2d1416f0e5bf2423e662ba635204ae612010753d0ca9ab6fab38cf0
-  data.tar.gz: 7d803a6634d8e058f2717935064977dd57e90933a5f1a27be8190ec7888d3a031fc119d945ff31ef19ea1a7678f7ab476258cb8e9379839e2e5d209e1087339a
+  metadata.gz: 95efa5d957d1837bab8b4bd6a0c96fdeeafeb9f8fc823f8588d9feb80fcc6f401394b6ddedef4407b7691d8ba7eee772c4d2d071129c633b7c4e72b442d99d33
+  data.tar.gz: a7619a5354f6651ab6ef0f214ca0f87792927139dfd18b2f245ffab0cba82393dffcf7691a553a3a88ec79d6eff9bb8fa45f63ba88b7803434948c0958e69141

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 0.1.3: 2018-08-30
+
+### Improvements
+
+  * Added support for ignoring broken lines.
+
+  * Added support for Mroonga style log.
+
+  * Added support for both process ID and thread ID case.
+
 ## 0.1.2: 2018-02-04
 
 ### Improvements

data/lib/groonga-log/entry.rb

@@ -18,6 +18,7 @@ module GroongaLog
   class Entry < Struct.new(:timestamp,
                            :log_level,
                            :pid,
+                           :thread_id,
                            :message)
   end
 end

data/lib/groonga-log/parser.rb

@@ -23,10 +23,11 @@ module GroongaLog
   class Parser
     PATTERN =
       /\A(?<year>\d{4})-(?<month>\d\d)-(?<day>\d\d)
-          \ (?<hour>\d\d):(?<minute>\d\d):(?<second>\d\d)\.(?<micro_second>\d+)
-          \|(?<log_level>.)
-          \|(?:(?<pid>\d+):)?
-          \ (?<message>[^\r\n]*)/x
+          \ (?<hour>\d\d):(?<minute>\d\d):(?<second>\d\d)\.(?<micro_second>\d+)\|
+          (?<log_level>.)\|
+          (?:(?<pid>\d+)[|:])?
+          (?:(?<thread_id>[\da-fA-F]+)[|:])?
+          \ ?(?<message>[^\r\n]*)/x
     PATH_TIMESTAMP_PATTERN = /(\d{4})-(\d{2})-(\d{2})-
                               (\d{2})-(\d{2})-(\d{2})-(\d{6})
                               (?:\.(?:gz|zip))?\z/xi
@@ -68,22 +69,25 @@ module GroongaLog
           next unless line.valid_encoding?
         end
 
-        m = PATTERN.match(line)
+        match_data = PATTERN.match(line)
+        next if match_data.nil?
 
         entry = Entry.new
 
-        year = m["year"].to_i
-        month = m["month"].to_i
-        day = m["day"].to_i
-        hour = m["hour"].to_i
-        minute = m["minute"].to_i
-        second = m["second"].to_i
-        micro_second = m["micro_second"].to_i
+        year = Integer(match_data[:year], 10)
+        month = Integer(match_data[:month], 10)
+        day = Integer(match_data[:day], 10)
+        hour = Integer(match_data[:hour], 10)
+        minute = Integer(match_data[:minute], 10)
+        second = Integer(match_data[:second], 10)
+        micro_second = Integer(match_data[:micro_second], 10)
         entry.timestamp = Time.local(year, month, day,
                                      hour, minute, second, micro_second)
-        entry.log_level = log_level_to_symbol(m["log_level"])
-        entry.pid = m["pid"].to_i if m["pid"]
-        entry.message = m["message"]
+        entry.log_level = log_level_to_symbol(match_data[:log_level])
+        pid = match_data[:pid]
+        entry.pid = Integer(pid, 10) if pid
+        entry.thread_id = match_data[:thread_id]
+        entry.message = match_data[:message]
         yield entry
       end
     end

data/lib/groonga-log/version.rb

@@ -1,3 +1,3 @@
 module GroongaLog
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-log
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Horimoto Yasuhiro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: Groonga-log is a collection of library and tools to process [Groonga](http://groonga.org/)'s