fastly_nsq 1.15.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135337a9892fdb4e0ddb5d448cae0f9d298b66a3a1a2d53966b9ba1c3c31d734
-  data.tar.gz: 103ab244297b6e29b0f50fdda88881cbe030943b2d019dcf31f9080203b8d36b
+  metadata.gz: 6973f2a953a18f9f5b63d6e7225c94264f56485b4632a409c820b5b61f91b050
+  data.tar.gz: 1a8f39f1085191666a6ebccff53a8c6f691fad4770bea6a48affc8f7998a878b
 SHA512:
-  metadata.gz: 948bd9896a2709c88b2dffdfc8fa13de42d8f0d46f62c8cd635ff4323dd57a2be75cb805598a6878059a7416aa5e78f719cd4d026462833fe609168a46e8ebd9
-  data.tar.gz: 299eb6013dc14fd5f7fc84e752d75b60c633883e60517b9f507e7247bca4d6bb0a2ca4825cffc8b3836697208e76cac464a83ec25bda5119b852c724b25b82bc
+  metadata.gz: da7997c5cdc6b8cb7d5feeacb0feab24c062076c92b8a3b23ddb49416d5a1fe57d0c241a68b20b5aed15c3a2c6cad89015557268dd2827fa49a7c63236de6300
+  data.tar.gz: 007a732d613f15d099e28f301db5537d35cfe7675d45f46946526eb275b5196496520a1b2f0aaf3c011414b0b55eafa19218f5f71cf6a9fb42ea59678fc11b1b

data/.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+25bc1d8cd908a86e8f7536192541a0d3b66f07db
+7c4cf244c4586d3bd280fee7909b6bcabda34998
+2e09ec7d8205b3ed3c2093777ae5382723919787
+5381db0ed1493235a7095a51cdbd67b88caa47d2
+d77aee840f7affb6ccdeb3748e0c50ccea96f7ef
+ca9a1aa122ead418879ecb6a104fb61054fe675e

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+3.0.3

data/.travis.yml

@@ -2,14 +2,15 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.3.5
-  - 2.4.2
-  - 2.5.1
+  - 2.6.9
+  - 2.7.5
+  - 3.0.3
 script:
   - bundle exec rake
 services:
   - docker
 before_install:
+  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
   - docker-compose up -d
 before_script:
   - gem update --system

data/ChangeLog.md

@@ -1,7 +1,30 @@
 # Change Log
 
-## [v1.15.0](https://github.com/fastly/fastly_nsq/tree/v1.15.0)
+## [v1.17.1](https://github.com/fastly/fastly_nsq/tree/v1.17.1) (2022-02-23)
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.17.0...v1.17.1)
 
+**Merged pull requests:**
+
+- Use standardrb for style and formatting [\#104](https://github.com/fastly/fastly_nsq/pull/104)
+
+## [v1.17.0](https://github.com/fastly/fastly_nsq/tree/v1.17.0) (2021-02-11)
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.16.0...v1.17.0)
+
+**Merged pull requests:**
+
+- Support for arbitary sent\_at Time [\#99](https://github.com/fastly/fastly_nsq/pull/99) ([leklund](https://github.com/leklund))
+- remove version pin on rake for development [\#97](https://github.com/fastly/fastly_nsq/pull/97) ([leklund](https://github.com/leklund))
+- Ignore from Humane Registry [\#96](https://github.com/fastly/fastly_nsq/pull/96) ([leklund](https://github.com/leklund))
+
+## [v1.16.0](https://github.com/fastly/fastly_nsq/tree/v1.16.0) (2019-08-16)
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.15.0...v1.16.0)
+
+**Merged pull requests:**
+
+- Log the internal NSQ id [\#95](https://github.com/fastly/fastly_nsq/pull/95) ([leklund](https://github.com/leklund))
+- Consumer still attempts connections in Test mode [\#93](https://github.com/fastly/fastly_nsq/pull/93) ([alieander](https://github.com/alieander))
+
+## [v1.15.0](https://github.com/fastly/fastly_nsq/tree/v1.15.0) (2018-10-05)
 [Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.14.0...v1.15.0)
 
 **Merged pull requests:**

data/Gemfile

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-gem 'bundler-audit', '~> 0.5.0'
-gem 'newrelic_rpm', require: false
-gem 'overcommit', '~> 0.32.0'
-gem 'rake', '~> 11.1.2'
-gem 'rdoc', '~> 4.2.2'
-gem 'rubocop', '~> 0.51.0'
-gem 'rubygems-tasks', '~> 0.2'
+gem "bundler-audit"
+gem "newrelic_rpm", require: false
+gem "overcommit", "~> 0.32.0"
+gem "rake"
+gem "rdoc"
+gem "standard"
+gem "rubygems-tasks", "~> 0.2"

data/README.md

@@ -1,4 +1,4 @@
-# fastly_nsq [![Build Status](https://travis-ci.org/fastly/fastly_nsq.svg?branch=master)](https://travis-ci.org/fastly/fastly_nsq)
+# fastly_nsq [![Build Status](https://travis-ci.org/fastly/fastly_nsq.svg?branch=main)](https://travis-ci.org/fastly/fastly_nsq)
 
 NSQ adapter and testing objects
 for using the NSQ messaging system
@@ -334,3 +334,7 @@ You will still need the `ENV` variables as defined above.
 Copyright (c) 2016 [Fastly, Inc](https://fastly.com) under an MIT license.
 
 See [LICENSE.txt](LICENSE.txt) for details.
+
+# Metadata
+
+- Ignore

data/Rakefile

@@ -1,28 +1,28 @@
 # frozen_string_literal: true
 
-require 'rubygems'
+require "rubygems"
 
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError => e
   abort e.message
 end
 
-require 'rake'
+require "rake"
 
-require 'rubygems/tasks'
+require "rubygems/tasks"
 Gem::Tasks.new
 
-require 'rdoc/task'
+require "rdoc/task"
 RDoc::Task.new
 task doc: :rdoc
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-require 'bundler/audit/cli'
+require "bundler/audit/cli"
 namespace :bundler do
-  desc 'Updates the ruby-advisory-db and runs audit'
+  desc "Updates the ruby-advisory-db and runs audit"
   task :audit do
     %w[update check].each do |command|
       Bundler::Audit::CLI.start [command]
@@ -30,8 +30,7 @@ namespace :bundler do
   end
 end
 
-require 'rubocop/rake_task'
-RuboCop::RakeTask.new
+require "standard/rake"
 
 task(:default).clear
-task default: ['spec', 'rubocop', 'bundler:audit']
+task default: ["spec", "standard", "bundler:audit"]

data/fastly_nsq.gemspec

@@ -1,36 +1,36 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fastly_nsq/version'
+require "fastly_nsq/version"
 
 Gem::Specification.new do |gem|
-  gem.name          = 'fastly_nsq'
-  gem.version       = FastlyNsq::VERSION
-  gem.summary       = 'Fastly NSQ Adapter'
-  gem.description   = "Helper classes for Fastly's NSQ Services"
-  gem.license       = 'MIT'
-  gem.authors       = ["Tommy O'Neil", 'Adarsh Pandit', 'Joshua Wehner', 'Lukas Eklund', 'Josh Lane', 'Hassan Shahid']
-  gem.email         = 'tommy@fastly.com'
-  gem.homepage      = 'https://github.com/fastly/fastly_nsq'
+  gem.name = "fastly_nsq"
+  gem.version = FastlyNsq::VERSION
+  gem.summary = "Fastly NSQ Adapter"
+  gem.description = "Helper classes for Fastly's NSQ Services"
+  gem.license = "MIT"
+  gem.authors = ["Tommy O'Neil", "Adarsh Pandit", "Joshua Wehner", "Lukas Eklund", "Josh Lane", "Hassan Shahid"]
+  gem.email = "tommy@fastly.com"
+  gem.homepage = "https://github.com/fastly/fastly_nsq"
 
-  gem.files         = `git ls-files`.split("\n")
+  gem.files = `git ls-files`.split("\n")
 
-  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|features)/})
-  gem.require_paths = ['lib']
+  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  gem.test_files = gem.files.grep(%r{^(test|features)/})
+  gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'awesome_print', '~> 1.6'
-  gem.add_development_dependency 'bundler', '~> 1.12'
-  gem.add_development_dependency 'dotenv'
-  gem.add_development_dependency 'pry-byebug', '~> 3.3'
-  gem.add_development_dependency 'rspec', '~> 3.4'
-  gem.add_development_dependency 'rspec-eventually', '0.2'
-  gem.add_development_dependency 'timecop'
-  gem.add_development_dependency 'webmock', '~> 3.0'
-  gem.add_development_dependency 'yard'
+  gem.add_development_dependency "awesome_print", "~> 1.6"
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "dotenv"
+  gem.add_development_dependency "pry-byebug", "~> 3.3"
+  gem.add_development_dependency "rspec", "~> 3.4"
+  gem.add_development_dependency "rspec-eventually", "0.2"
+  gem.add_development_dependency "timecop"
+  gem.add_development_dependency "webmock", "~> 3.0"
+  gem.add_development_dependency "yard"
 
-  gem.add_dependency 'concurrent-ruby', '~> 1.0'
-  gem.add_dependency 'nsq-ruby', '~> 2.3'
-  gem.add_dependency 'priority_queue_cxx', '~> 0.3'
+  gem.add_dependency "concurrent-ruby", "~> 1.0"
+  gem.add_dependency "nsq-ruby-fastly", "~> 2.4"
+  gem.add_dependency "priority_queue_cxx", "~> 0.3"
 end

data/lib/fastly_nsq/cli.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength
 $stdout.sync = true
 
-require 'fastly_nsq'
-require 'fastly_nsq/launcher'
-require 'fastly_nsq/manager'
-require 'fileutils'
-require 'optparse'
-require 'singleton'
+require "fastly_nsq"
+require "fastly_nsq/launcher"
+require "fastly_nsq/manager"
+require "fileutils"
+require "optparse"
+require "singleton"
 
 # Provides functionality to support running FastlyNsq as a command line
 # application that listens and processes NSQ messages.
@@ -44,26 +43,24 @@ class FastlyNsq::CLI
 
     read_loop
   rescue Interrupt
-    FastlyNsq.logger.info 'Shutting down'
+    FastlyNsq.logger.info "Shutting down"
     launcher.stop
     # Explicitly exit so busy Processor threads can't block
     # process shutdown.
-    FastlyNsq.logger.info 'Bye!'
+    FastlyNsq.logger.info "Bye!"
     exit(0)
   end
 
   private
 
   def launcher
-    @launcher ||= FastlyNsq::Launcher.new(options)
+    @launcher ||= FastlyNsq::Launcher.new(**options)
   end
 
   def read_loop
     trapped_read_io = trap_signals
-    loop do
-      readable_io = IO.select([trapped_read_io])
-      break unless readable_io
-      signal = readable_io.first[0].gets.strip
+    while trapped_read_io.wait_readable
+      signal = trapped_read_io.gets.strip
       handle_signal signal
     end
   end
@@ -72,51 +69,51 @@ class FastlyNsq::CLI
     boot_rails
     require options[:require] if options[:require]
     FastlyNsq.logger.info "Running in #{RUBY_DESCRIPTION}"
-    FastlyNsq.logger.info 'Starting processing, hit Ctrl-C to stop' unless options[:daemon]
+    FastlyNsq.logger.info "Starting processing, hit Ctrl-C to stop" unless options[:daemon]
   end
 
   def boot_rails
-    return unless ENV['RAILS_ENV']
+    return unless ENV["RAILS_ENV"]
 
-    require 'rails'
-    require File.expand_path('./config/application.rb')
-    require File.expand_path('./config/environment.rb')
+    require "rails"
+    require File.expand_path("./config/application.rb")
+    require File.expand_path("./config/environment.rb")
   end
 
   def parse(args)
     opts = {}
 
     @parser = OptionParser.new do |o|
-      o.on '-c', '--concurrency COUNT', 'Number of threads used to process messages' do |arg|
+      o.on "-c", "--concurrency COUNT", "Number of threads used to process messages" do |arg|
         opts[:max_threads] = arg
       end
 
-      o.on '-d', '--daemon', 'Daemonize process' do |arg|
+      o.on "-d", "--daemon", "Daemonize process" do |arg|
         opts[:daemonize] = arg
       end
 
-      o.on '-L', '--logfile PATH', 'path to writable logfile' do |arg|
+      o.on "-L", "--logfile PATH", "path to writable logfile" do |arg|
         opts[:logfile] = arg
       end
 
-      o.on '-P', '--pidfile PATH', 'path to pidfile' do |arg|
+      o.on "-P", "--pidfile PATH", "path to pidfile" do |arg|
         opts[:pidfile] = arg
       end
 
-      o.on '-r', '--require [PATH|DIR]', 'Location of message_processor definition' do |arg|
+      o.on "-r", "--require [PATH|DIR]", "Location of message_processor definition" do |arg|
         opts[:require] = arg
       end
 
-      o.on '-v', '--verbose', 'enable verbose logging output' do |arg|
+      o.on "-v", "--verbose", "enable verbose logging output" do |arg|
         opts[:verbose] = arg
       end
 
-      o.on '-t', '--timeout SECONDS', 'shutdown deadline timeout' do |arg|
+      o.on "-t", "--timeout SECONDS", "shutdown deadline timeout" do |arg|
         opts[:timeout] = arg
       end
     end
 
-    @parser.banner = 'fastly_nsq [options]'
+    @parser.banner = "fastly_nsq [options]"
     @parser.parse!(args)
 
     @options = opts
@@ -171,13 +168,11 @@ class FastlyNsq::CLI
     sigs = %w[INT TERM TTIN USR1]
 
     sigs.each do |sig|
-      begin
-        trap sig do
-          self_write.puts(sig)
-        end
-      rescue ArgumentError
-        puts "Signal #{sig} not supported"
+      trap sig do
+        self_write.puts(sig)
       end
+    rescue ArgumentError
+      puts "Signal #{sig} not supported"
     end
     self_read
   end
@@ -185,28 +180,28 @@ class FastlyNsq::CLI
   def handle_signal(sig)
     FastlyNsq.logger.debug "Got #{sig} signal"
     case sig
-    when 'INT'
+    when "INT"
       # Handle Ctrl-C in JRuby like MRI
       # http://jira.codehaus.org/browse/JRUBY-4637
       raise Interrupt
-    when 'TERM'
+    when "TERM"
       # Heroku sends TERM and then waits 10 seconds for process to exit.
       raise Interrupt
-    when 'USR1'
-      FastlyNsq.logger.info 'Received USR1, no longer accepting new work'
+    when "USR1"
+      FastlyNsq.logger.info "Received USR1, no longer accepting new work"
       launcher.stop_listeners
-    when 'TTIN'
+    when "TTIN"
       handle_ttin
     end
   end
 
   def handle_ttin
     Thread.list.each do |thread|
-      FastlyNsq.logger.warn "Thread TID-#{thread.object_id.to_s(36)} #{thread['fastly_nsq_label']}"
+      FastlyNsq.logger.warn "Thread TID-#{thread.object_id.to_s(36)} #{thread["fastly_nsq_label"]}"
       if thread.backtrace
         FastlyNsq.logger.warn thread.backtrace.join("\n")
       else
-        FastlyNsq.logger.warn '<no backtrace available>'
+        FastlyNsq.logger.warn "<no backtrace available>"
       end
     end
   end
@@ -224,26 +219,24 @@ class FastlyNsq::CLI
     reopen(files_to_reopen)
 
     [$stdout, $stderr].each do |io|
-      File.open(options.fetch(:logfile, '/dev/null'), 'ab') do |f|
+      File.open(options.fetch(:logfile, "/dev/null"), "ab") do |f|
         io.reopen(f)
       end
       io.sync = true
     end
-    $stdin.reopen('/dev/null')
+    $stdin.reopen("/dev/null")
 
     setup_logger
   end
 
   def reopen(files)
     files.each do |file|
-      begin
-        file.reopen file.path, 'a+'
-        file.sync = true
-      rescue IOError => e
-        FastlyNsq.logger.warn "IOError reopening file:  #{e.message}"
-      rescue StandardError => e
-        FastlyNsq.logger.error "Non IOError reopening file:  #{e.message}"
-      end
+      file.reopen file.path, "a+"
+      file.sync = true
+    rescue IOError => e
+      FastlyNsq.logger.warn "IOError reopening file:  #{e.message}"
+    rescue => e
+      FastlyNsq.logger.error "Non IOError reopening file:  #{e.message}"
     end
   end
 

data/lib/fastly_nsq/consumer.rb

@@ -78,11 +78,11 @@ class FastlyNsq::Consumer
   #     channel: 'channel'
   #   )
   def initialize(topic:, channel:, queue: nil, tls_options: nil, connect_timeout: DEFAULT_CONNECTION_TIMEOUT, max_attempts: FastlyNsq.max_attempts, **options)
-    @topic           = topic
-    @channel         = channel
-    @tls_options     = FastlyNsq::TlsOptions.as_hash(tls_options)
+    @topic = topic
+    @channel = channel
+    @tls_options = FastlyNsq::TlsOptions.as_hash(tls_options)
     @connect_timeout = connect_timeout
-    @max_attempts    = max_attempts
+    @max_attempts = max_attempts
 
     @connection = connect(queue, **options)
   end
@@ -106,8 +106,8 @@ class FastlyNsq::Consumer
         channel: channel,
         queue: queue,
         max_attempts: max_attempts,
-        **options,
-      }.merge(tls_options),
+        **options
+      }.merge(tls_options)
     )
   end
 end

data/lib/fastly_nsq/feeder.rb

@@ -36,13 +36,11 @@ class FastlyNsq::Feeder
   # @see Nsq::Connection#read_loop
   def push(message)
     FastlyNsq.manager.pool.post(priority) do
-      begin
-        processor.call(message)
-      rescue => ex
-        FastlyNsq.logger.error ex
-        FastlyNsq.tracer.notice_error ex
-        raise ex
-      end
+      processor.call(message)
+    rescue => ex
+      FastlyNsq.logger.error ex
+      FastlyNsq.tracer.notice_error ex
+      raise ex
     end
   end
 end