buffered_remote_syslog_logger 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf4fdefc93262888208177fabe89d1602b9dc4f
-  data.tar.gz: 638f1f14bab0d1556041a2473cee8bc918565508
+  metadata.gz: a00f1f010ed1338144b0569ef38eea8d3343a97b
+  data.tar.gz: ca06f5b9ef36d742acab3536877df8875ab5411f
 SHA512:
-  metadata.gz: 0a4afcc38e107d70b778ef85e27af1872692226b8b6dc6a0f3918fb685aead4cded419f8c6dbcd00a2d983781431cc62983b0d09edcbd83b6aa3edb750d00204
-  data.tar.gz: 8a57ed1be5c01390526e6371d28ba8ed7f5ccc8873bf6e9d3988b8a5932081c8b2477e21d621a2c8dbc040f97b3cbe0b303ee1f0836dc41afd59b0eb4ec2963e
+  metadata.gz: 6d728dcca2c28b33c9e1b015e798aae233072a7f6a3b1edd8a49b70b77e0837403d77d3e8e36eb74d88a663e9d2564e24eb10ae7d2aaa9f6737f04685520b701
+  data.tar.gz: 1f9ebebed6b1bb8cdeccefa3aac4605f938182388227bca3f4a389aca6bf7b3703e6cbc092fec7ba906e132b8c35d50642ca89a4283c8a74340276ef2c2664dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buffered_remote_syslog_logger (0.2.1)
+    buffered_remote_syslog_logger (0.2.2)
       activesupport (< 4.0)
 
 GEM

data/lib/buffered_remote_syslog_logger/tcp_logger.rb

@@ -198,13 +198,16 @@ module BufferedRemoteSyslogLogger
 
 
     def format_message severity, message
-      message_marker = "<#{facility + LEVEL_LOGGER_MAP[severity]}>#{Time.now.strftime("%b %e %H:%M:%S")} #{hostname.rstrip} [#{program_name.rstrip}][#{request_id.rstrip}]: "
-      per_chunk_max_length = 1024 - (message_marker.bytesize + 1)
+      message_marker = "<#{facility + LEVEL_LOGGER_MAP[severity]}>#{Time.now.strftime("%b %e %H:%M:%S")} #{hostname.rstrip} [#{program_name.rstrip}][#{request_id.rstrip}]"
+      per_chunk_max_length = 1024 - (message_marker.bytesize + 11)
 
+      i = 0
       message.split("\n").inject([]) do |target_array, message_line|
+        i += 1
+        sequenced_message_marker = message_marker + '[' + ("%03d" % i) + ']: '
         message_line_chunk_count = (message_line.bytesize.to_f / per_chunk_max_length.to_f).ceil.to_i
         message_line_chunk_count.times.each do |chunk_index|
-          target_array << message_marker + message_line.byteslice((chunk_index + 0) * per_chunk_max_length, per_chunk_max_length)
+          target_array << sequenced_message_marker + message_line.byteslice((chunk_index + 0) * per_chunk_max_length, per_chunk_max_length)
         end
         target_array
       end

data/lib/buffered_remote_syslog_logger/version.rb

@@ -1,3 +1,3 @@
 module BufferedRemoteSyslogLogger
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/lib/buffered_remote_syslog_logger/tcp_logger_spec.rb

@@ -9,10 +9,10 @@ describe BufferedRemoteSyslogLogger::TcpLogger do
         string = SecureRandom.hex(650)
         chunks = BufferedRemoteSyslogLogger::TcpLogger.new.send(:format_message, 4, string)
 
-        prepend_length = `hostname`.rstrip.size + 57
+        prepend_length = `hostname`.rstrip.size + 65
 
         chunks.size.should eq 2
-        chunks.first.size.should eq 1023
+        chunks.first.size.should eq 1020
         chunks[0].should =~ /#{string.byteslice(0, 1024 - prepend_length - 1)}/
         chunks[1].should =~ /#{string.byteslice(1024 - prepend_length - 1, 1024 - prepend_length - 1)}/
       end
@@ -36,7 +36,7 @@ describe BufferedRemoteSyslogLogger::TcpLogger do
     it 'should send the message along' do
       socket = TCPSocket.new('127.0.0.1', 514)
       TCPSocket.stub(:new).and_return(socket)
-      socket.should_receive(:write).with("<14>#{Time.now.strftime("%b %e %H:%M:%S")} #{`hostname`.rstrip} [buffered_remote_syslog_logger][1]: foo\n")
+      socket.should_receive(:write).with("<14>#{Time.now.strftime("%b %e %H:%M:%S")} #{`hostname`.rstrip} [buffered_remote_syslog_logger][1][001]: foo\n")
       socket.stub(:flush)
       logger = BufferedRemoteSyslogLogger::TcpLogger.new
       logger.info('foo')
@@ -46,9 +46,9 @@ describe BufferedRemoteSyslogLogger::TcpLogger do
       it 'should retry several times' do
         sockets = [TCPSocket.new('127.0.0.1', 514), TCPSocket.new('127.0.0.1', 514), TCPSocket.new('127.0.0.1', 514)]
         TCPSocket.stub(:new) { sockets.shift }
-        sockets[0].should_receive(:write).with("<14>#{Time.now.strftime("%b %e %H:%M:%S")} #{`hostname`.rstrip} [buffered_remote_syslog_logger][1]: foo\n").and_raise(Errno::ECONNREFUSED.new)
-        sockets[1].should_receive(:write).with("<14>#{Time.now.strftime("%b %e %H:%M:%S")} #{`hostname`.rstrip} [buffered_remote_syslog_logger][1]: foo\n").and_raise(Errno::ECONNREFUSED.new)
-        sockets[2].should_receive(:write).with("<14>#{Time.now.strftime("%b %e %H:%M:%S")} #{`hostname`.rstrip} [buffered_remote_syslog_logger][1]: foo\n").and_raise(Errno::ECONNREFUSED.new)
+        sockets[0].should_receive(:write).with("<14>#{Time.now.strftime("%b %e %H:%M:%S")} #{`hostname`.rstrip} [buffered_remote_syslog_logger][1][001]: foo\n").and_raise(Errno::ECONNREFUSED.new)
+        sockets[1].should_receive(:write).with("<14>#{Time.now.strftime("%b %e %H:%M:%S")} #{`hostname`.rstrip} [buffered_remote_syslog_logger][1][001]: foo\n").and_raise(Errno::ECONNREFUSED.new)
+        sockets[2].should_receive(:write).with("<14>#{Time.now.strftime("%b %e %H:%M:%S")} #{`hostname`.rstrip} [buffered_remote_syslog_logger][1][001]: foo\n").and_raise(Errno::ECONNREFUSED.new)
         Socket.any_instance.stub(:flush)
         logger = BufferedRemoteSyslogLogger::TcpLogger.new
         logger.info('foo')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buffered_remote_syslog_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - DailyDeal Development
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler