From aa6005c3891dc7fdd21ddbcef093122c03017812 Mon Sep 17 00:00:00 2001 From: Mattia Giuffrida Date: Thu, 14 Jul 2016 12:52:37 +0100 Subject: [PATCH] added rescue on Sidekiq::Middleware::Server::LogstashLogging#parse_time version bump 0.2.5 --- README.md | 2 +- lib/sidekiq/logstash/version.rb | 2 +- lib/sidekiq/middleware/server/logstah_logging.rb | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9ff16fc..31bb0e7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Sidekiq::Logstash -[version](https://github.com/iMacTia/sidekiq-logstash) [version](https://travis-ci.org/iMacTia/sidekiq-logstash) +[version](https://github.com/iMacTia/sidekiq-logstash) [version](https://travis-ci.org/iMacTia/sidekiq-logstash) Sidekiq::Logstash turns your [Sidekiq](https://github.com/mperham/sidekiq) log into an organised, aggregated, JSON-syntax log ready to be sent to a logstash server. diff --git a/lib/sidekiq/logstash/version.rb b/lib/sidekiq/logstash/version.rb index 2814528..4190719 100644 --- a/lib/sidekiq/logstash/version.rb +++ b/lib/sidekiq/logstash/version.rb @@ -1,5 +1,5 @@ module Sidekiq module Logstash - VERSION = '0.2.4' + VERSION = '0.2.5' end end diff --git a/lib/sidekiq/middleware/server/logstah_logging.rb b/lib/sidekiq/middleware/server/logstah_logging.rb index 9597caf..0cf19cb 100644 --- a/lib/sidekiq/middleware/server/logstah_logging.rb +++ b/lib/sidekiq/middleware/server/logstah_logging.rb @@ -67,6 +67,8 @@ def parse_time(timestamp) timestamp.is_a?(Float) ? Time.at(timestamp).utc : Time.parse(timestamp) + rescue + timestamp end def filter_args