restash 0.2.1 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjFiNDA4NjA4MzFiMTQ2ZWRlM2NkMDVkNmI0OWZlN2FiNDlkMjk1ZQ==
+    NDVhNzlhN2RhM2U0OWEwOGJmYzRjMGM5Njc4YmI2ODJiMGQyNmE3Zg==
   data.tar.gz: !binary |-
-    ZGIyOGZlNWFiNzJmOTQ1ZmQ4NzQ5ZDI2YTY5NWE0ZWE2YmNmMTdkYg==
+    ZTAzODBkNDBmNDk5OGNhZTVlZjFiMDdkMDJmNjMyZmE2ZmIxOGM4ZA==
 SHA512:
   metadata.gz: !binary |-
-    MGE1NTUwYzkxNWMwNGZkNDUwYTVlNzI2NmRlYjJkMTU1NWM0NTM3ODdhNDRk
-    N2FmNDJiODgyNDAzYWIyZjJkZGM5YmYwMjljNGJmMjJkZWE2MmUwOWQ4NjU2
-    ZTYwMTRkNGZmZDMyYzg0YzkyYTdjZDkzYzM5NGNlNWNkNTk5Nzk=
+    YWRjNzQxNGRkOGQ1YTE0MTkwNjZmMTJiYzJlM2FiOTAzODFiOGUyNDg3ZTQw
+    OTkwMTUzN2I3MTNkNWM5YzQ5NjU0NWY3MjQyMDE3OTgwNDk1YmExOTEyMDZh
+    OTY5Y2Y0YzlhOGEzOGZiNGNkNDVlNzg3M2EwYzZhZjM2ZDhiMGY=
   data.tar.gz: !binary |-
-    MDNiYjI1NDE4ZDhlMWUxYTI2M2RiMTY4MWQ5MTEwMzIyYjdhOGM5N2U1MjY0
-    NDhlNzI5NDI5YjA4Yjk2MDBhYThiYWE1YjMzY2QxNjE5OGMwNWFmNTcwN2Q3
-    NTEzMGZiMjg4ODFhZGQ4MGUxMjM3OTAzYzgzMmVkYjJlZWJlZGM=
+    Y2M2YjNkZTQxMTNlNzQ0YWZmNWVhODZmOGRmMzI3MDBkMDdkM2RlNTY4ZWM2
+    YTkwZmVlNDMwZGY3Y2U3N2Q3NTFjZWYwODQ4YjllNDIwOGM0MTcyNTVjZDFi
+    MDg4ZGNjMjY1ZDU4ZDZkY2RjNjMzYTlhY2VlMDY4YmQ2OTg3NjU=

data/.travis.yml

@@ -3,7 +3,11 @@ language: ruby
 rvm:
 - 2.2
 - 2.3
-- 2.4
+- head
+matrix:
+  allow_failures:
+    - rvm: head
+    - rvm: 2.3
 before_install: gem install bundler -v 1.12.5
 deploy:
   api_key:
@@ -11,4 +15,4 @@ deploy:
   provider: rubygems
   on:
     rvm: 2.2
-    all_branches: true
+    branch: master

data/README.md

@@ -10,14 +10,17 @@ Resque::Failure::Multiple.classes = [Resque::Failure::Redis, Resque::Failure::Lo
 Resque::Failure.backend = Resque::Failure::Multiple
 ```
 
-Configure logstash host and port (currently support only udp)
+Configure logstash host and port. Supports only tcp, due to the large payload. A timeout can be passed in the options.
 ```
 Restash::Conf.configure do |conf|
   conf.logstash_host = ENV['LOGSTASH_HOST']
   conf.logstash_port = ENV['LOGSTASH_PORT']
+  conf.options = {connect_timeout: timeout1, write_timeout: timeout2, read_timeout: timeout3}
 end
 ```
 
+Additional options can be explored in the [TCPTimeout](https://github.com/lann/tcp-timeout-ruby) project. The options are passed as is to a new TCPTimeout::TCPSocket object on every message.
+
 
 ## License
 

data/lib/resque/failure/logstash.rb

@@ -7,11 +7,12 @@ module Resque
 
       def save
         begin
-          Restash::Conf.logger.fatal exception: exception.to_s,
-                                     failure_line: exception.backtrace[0],
-                                     worker: worker.to_s,
-                                     queue: queue,
-                                     payload: payload
+          Restash::Conf.logger.write({ exception: exception.to_s,
+                                       backtrace: exception.backtrace,
+                                       worker: worker.to_s,
+                                       queue: queue,
+                                       payload: payload,
+                                       tags: [:resque_failure] }.to_json)
         rescue => e
           puts "Failed to send to logstash: #{e.message}\n#{e.backtrace}"
         end

data/lib/restash/conf.rb

@@ -1,11 +1,11 @@
-require 'logstash-logger'
+require 'restash/logger'
 
 module Restash
   class Conf
 
     class << self
 
-      attr_accessor :logstash_host, :logstash_port
+      attr_accessor :logstash_host, :logstash_port, :options
 
       def configure
         yield self
@@ -13,7 +13,7 @@ module Restash
       end
 
       def logger
-        @logger ||= LogStashLogger.new(logstash_host, logstash_port)
+        @logger ||= Restash::Logger.new(logstash_host, logstash_port, options)
       end
 
     end

data/lib/restash/logger.rb

@@ -0,0 +1,20 @@
+require 'tcp_timeout'
+
+module Restash
+  class Logger
+
+    def initialize(host, port, options)
+      @host = host
+      @port = port
+      @options = options
+    end
+
+    def write(data)
+      sock = TCPTimeout::TCPSocket.new(@host, @port, @options)
+      sock.write(data)
+      sock.close
+    end
+
+  end
+end
+

data/lib/restash/version.rb

@@ -1,3 +1,3 @@
 module Restash
-  VERSION = '0.2.1'
+  VERSION = '0.3.1'
 end

data/restash.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_runtime_dependency 'logstash-logger'
   spec.add_runtime_dependency 'resque'
   spec.add_runtime_dependency 'json'
+  spec.add_runtime_dependency 'tcp_timeout'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restash
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Ariel Cabib
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: logstash-logger
+  name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: tcp_timeout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -112,6 +112,7 @@ files:
 - bin/setup
 - lib/resque/failure/logstash.rb
 - lib/restash/conf.rb
+- lib/restash/logger.rb
 - lib/restash/resque_server.rb
 - lib/restash/version.rb
 - restash.gemspec