zlog 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55398d282f9e6046be36f6d8536ed4b5758de790
-  data.tar.gz: 979dd8a9bd1fa1211d895ecf7cec33ca418d2321
+  metadata.gz: 8221af279519fb20d8f5a8c60646313a32dc0465
+  data.tar.gz: 3214baf78eaed6044728ff4425757f31369cafd1
 SHA512:
-  metadata.gz: b3f89f7624fbddb341dc02d25aea5fd0e1368e69c26bca1d93fb7ca56448e4e3b977c51190fe8677814d14ca09bd08af22875f26655e3275248bc41e24b40552
-  data.tar.gz: dd35a169d8db26157b362547f3893d35ee79bf1fe0245d4fcd9ba328dc74013e5811e82672e90297ab1fd8970b124110df3fddb50e542b168e39c45143bdb0fb
+  metadata.gz: 987a8dfc97ddb2846df805c247de4dbe2225570e6d34058e7386d456605656dc1b5aa370a9de8e24a94b243fd96843faf4dbfd57207d881c1420f8eda191f840
+  data.tar.gz: 69283e632c9b1f4fce4808f8ab4a170c2bd42bfc39c0666b06b8bb2ee31c1b1d1d3bc80816bbeb4d18fab43eec19ddf8fa0efbd21b3cea20b07d59c7eaef897d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.2
+
+* bugfix: corrected handling of jsony-messages in cli tool
+
 ## 0.9.1
 
 * bugfix: handle multiple log messages in json

data/lib/zlog/cli.rb

@@ -11,7 +11,8 @@ class Zlog::CLI
   end
 
   def convert_line line, opts = {}
-    Zlog::json_2_event(line).each do |e|
+    e = Zlog::json_2_event(line)
+    if not e.nil?
       @layout.format(e)
     end
   end

data/lib/zlog/zlog.rb

@@ -2,7 +2,7 @@ require 'json'
 require 'tmpdir'
 
 module Zlog
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
   extend self
 
   def init_stdout opts = {layout: :simple, loglevel: nil}
@@ -60,9 +60,7 @@ module Zlog
       # json example:
       # {"timestamp":"2013-10-10T18:37:38.513438+02:00","level":"DEBUG",
       #  "logger":"Log1-debug","message":"debugging info, this won't show up on console"}
-      Array(j['message']).map do |msg|
-        Logging::LogEvent.new( j['logger'], Logging.level_num(j['level']), msg, j['timestamp'] )
-      end
+      Logging::LogEvent.new( j['logger'], Logging.level_num(j['level']), j['message'].to_s, j['timestamp'] )
     rescue
       nil
     end

data/test/classes/zlog_spec.rb

@@ -51,12 +51,10 @@ describe Zlog do
     it "must convert a logging json to a logevent" do
       @examples.each do |e|
         r = Zlog.json_2_event e[:raw]
-        r.must_be_instance_of Array
-
-        r[0].must_be_instance_of Logging::LogEvent
-        r[0].level.must_equal e[:level]
-        r[0].logger.must_equal "Mocker#{e[:name]}"
-        r[0].data.must_equal "mock message #{e[:name]}"
+        r.must_be_instance_of Logging::LogEvent
+        r.level.must_equal e[:level]
+        r.logger.must_equal "Mocker#{e[:name]}"
+        r.data.must_equal "mock message #{e[:name]}"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zlog
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Dominik Richter