syslogger5424 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5aca48fbb6352b4a7a4bc1c8efc5f02a98b532b
-  data.tar.gz: 6aa5cb54e9e791362bbb2e8f63fd4f383cc8b259
+  metadata.gz: cb72907be740aa357f6e75ec6b6991e411495f61
+  data.tar.gz: 3623fb6277835cf58248194a2f88ca35759d7f6a
 SHA512:
-  metadata.gz: 7553cda8c414c9e79787c7af26c01cba6f8f9e43891c661d10dd0ccb1aa2be069df49ffa7d15dd76c46bf29b57a4040ac61f28eb0a44d15355b1663a26653504
-  data.tar.gz: 9a5cc28f8a00d500d2968f3194fc66a7d6fcc67f63d2169e837c1e0566fb734db3e1ff53bdbf2e453d3d1ef78e7ad31b7c1d5eac33115f75c5bc3db2b3c02bae
+  metadata.gz: 54ba31de3c9cfaeb31f3efdd263bec371a339c4706d1ba6583a970dcbc5f687fd06b87d0a5ac5dcfa498579a3044b1726b58ea8361d17728b370a53df0345529
+  data.tar.gz: c5c13c7e1d8fbcab763654ec95fb73d2ce63593ac4e35a1a82917dbeff3f803a3c11287c15388eb8594b41beb49090d425062e1f63f2fdf9446848b9ca7051b2

data/lib/syslogger/formatter/rfc5424.rb

@@ -76,27 +76,33 @@ module SysLogger
         # a block was received to generate the message.
         message_id = progname.nil? ? msgid : format_field(progname, 32)
 
-        @counter = (@counter + 1) % 65536
-
         structured_data = {
           "meta" => {
-            "x-group" => rand(99999999),
+            "x-group" => gen_xgroup,
             "x-counter" => @counter
           }
         }
 
-        sd = format_sdata(structured_data)
-
         lines = msg2str(message).split(/\r?\n/).reject(&:empty?).map do |line|
+          @counter = (@counter + 1) % 65536
+          structured_data["meta"]["x-counter"] = @counter
+          sd = format_sdata(structured_data)
           Format % [pri, datetime.strftime("%FT%T.%6N%:z"), @hostname,
                     @appname, format_field(@procid || Process.pid.to_s, 128),
                     message_id, sd, line]
         end
-
-        lines.join
+        if lines.size == 1
+          lines[0]
+        else
+          lines
+        end
       end
 
       private
+      def gen_xgroup
+        rand(99999999)
+      end
+
       def format_field(text, max_length)
         if text
           text[0..max_length].gsub(/\s+/, '')

data/lib/syslogger/logger.rb

@@ -22,9 +22,9 @@ module SysLogger
       # server properly.
       # default to a serverity of info.
       msg.split(/\r?\n/).each { |line|
-          if line then
-              self.info(line)
-          end
+        if line then
+          self.info(line)
+        end
       }
     end
 

data/spec/syslogger/io_spec.rb

@@ -16,6 +16,10 @@ describe SysLogger::IO do
       expect(io.string).to eq "foobar"
     end
 
+    it "handles array messages" do
+      subject.write(["foo", "bar"])
+      expect(io.string).to eq "foobar"
+    end
   end
 
   describe "unix_dgram_socket" do

data/spec/syslogger/logger_spec.rb

@@ -1,14 +1,31 @@
 describe SysLogger::Logger do
   let(:io) { StringIO.new }
+  let(:time_under_test) { Time.new(2019, 10, 28, 12, 26, 0, "-07:00") }
 
   subject { SysLogger::Logger.new(io) }
 
   its("logdev.dev")       { is_expected.to be io }
   its(:default_formatter) { is_expected.to be_a SysLogger::Formatter::RFC5424 }
 
+  before(:example) do
+    allow(Time).to receive(:now).and_return(time_under_test)
+    allow(Socket).to receive(:gethostname).and_return("testhostname")
+    allow(Process).to receive(:pid).and_return(1234)
+    allow_any_instance_of(SysLogger::Formatter::RFC5424).to receive(:gen_xgroup).and_return(98765)
+  end
+
   it "logs exceptions" do
     subject.error StandardError.new("foobar")
     expect(io.string).to match(
       /<187>1.* - #{Process.pid} - \[meta x-group=".*"\] foobar \(StandardError\)/)
   end
+
+  it "sends multiline messages as an array" do
+    expect(io).to receive(:write).with([
+      "<190>1 2019-10-28T12:26:00.000000-07:00 testhostname - 1234 - [meta x-group=\"98765\" x-counter=\"1\"] foo\n",
+      "<190>1 2019-10-28T12:26:00.000000-07:00 testhostname - 1234 - [meta x-group=\"98765\" x-counter=\"2\"] bar\n",
+      "<190>1 2019-10-28T12:26:00.000000-07:00 testhostname - 1234 - [meta x-group=\"98765\" x-counter=\"3\"] baz\n"
+    ])
+    subject.info "foo\nbar\nbaz"
+  end
 end

metadata

@@ -1,101 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: syslogger5424
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - EasyPost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mono_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-temp_dir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: support@easypost.com
+description: Logger subclass to log to syslog using the RFC 5424 format, with support
+  for STREAM- and DGRAM-mode domain sockets
+email: oss@easypost.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -111,25 +112,27 @@ files:
 - spec/syslogger/logger_spec.rb
 - spec/syslogger_spec.rb
 homepage: http://github.com/EasyPost/syslogger
-licenses: []
-metadata: {}
+licenses:
+- ISC
+metadata:
+  changelog_uri: https://github.com/easypost/syslogger/blob/master/CHANGES.md
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Logging via syslog using RFC 5424 format