sqewer 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a28c968f3a51ed4f10f5f1e301d7580c39ce0a3
-  data.tar.gz: eed7b54c31ba440d02e9c936dfe748308ce2adf4
+  metadata.gz: b0587cd9025e697b5a59b65e9a332d847896cc4d
+  data.tar.gz: b8387600d676de06a137ffa7adb83a63eb0cae71
 SHA512:
-  metadata.gz: f0386ee7b9544566759997509e3182a2fb50971c7f71f217c6efb5d6d9006e332867b346ee1858953d589e9d3802527b1a21170ca038d1721fb9e31fa5a5a3a1
-  data.tar.gz: fd59adf4ff3f6c920f0428b2dd915843e6f922906c36db7af5c4f3d203095a2961f3b82cd681d3fda8d153d9965770f18e0e035455a17db9b687b01125575ceb
+  metadata.gz: 3d40e03010b39caaac013142b3ebe29ec4f9de15371c4a43f8943635d2e8953ee69ab1c0d3da415c4556a24d7ec7b3a07bd41d46b26584a6d032eb4a6b870cce
+  data.tar.gz: 710bfe3a794e01bfbf0b07acd41edebb8ecbaf8ba9cf7efa6700feda9e280ccb2a2039b2a717c10687b30173186ffb8b775880ce17d721cd2bb995b70ac02346

data/DETAILS.md

@@ -128,7 +128,9 @@ The very minimal executable for running jobs would be this:
     require 'my_applicaion'
     Sqewer::CLI.run
 
-This will connect to the queue at the URL set in the `SQS_QUEUE_URL` environment variable.
+This will connect to the queue at the URL set in the `SQS_QUEUE_URL` environment variable, and
+use all the default parameters. The `CLI` module will also set up a signal handler to terminate
+the current jobs cleanly if the commandline app receives a USR1 and TERM.
 
 You can also run a worker without signal handling, for example in test
 environments. Note that the worker is asynchronous, it has worker threads
@@ -152,8 +154,20 @@ S3 bucket notifications coming into the same queue):
 
     worker = Sqewer::Worker.new(serializer: CustomSerializer.new)
 
-The `Sqewer::CLI` module that you run from the commandline handler application accepts the
-same options as the `Worker` constructor, so everything stays configurable.
+You can also elect to inherit from the `Worker` class and override some default constructor
+arguments:
+
+    class CustomWorker < Sqewer::Worker
+      def initialize(**kwargs)
+        super(serializer: CustomSerializer.mnew, ..., **kwargs)
+      end
+    end
+
+The `Sqewer::CLI` module that you run from the commandline handler application can be
+started with your custom Worker of choice:
+
+    custom_worker = Sqewer::Worker.new(logger: special_logger)
+    Sqewer::CLI.start(custom_worker)
 
 ## Threads versus processes
 

data/lib/sqewer/connection.rb

@@ -41,7 +41,8 @@ class Sqewer::Connection
   # @return [Array<Message>] an array of Message objects 
   def receive_messages
     client = ::Aws::SQS::Client.new
-    response = client.receive_message(queue_url: @queue_url, wait_time_seconds: DEFAULT_TIMEOUT_SECONDS, max_number_of_messages: 10)
+    response = client.receive_message(queue_url: @queue_url,
+      wait_time_seconds: DEFAULT_TIMEOUT_SECONDS, max_number_of_messages: 10)
     response.messages.map do | message |
       Message.new(message.receipt_handle, message.body)
     end

data/lib/sqewer/version.rb

@@ -1,3 +1,3 @@
 module Sqewer
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/lib/sqewer/worker.rb

@@ -124,18 +124,7 @@ class Sqewer::Worker
       end
     end
     
-    # It makes sense to have one GC caller per process, since a GC cuts across threads.
-    # We will perform a full GC cycle after the same number of jobs as our consumer thread
-    # count - so not on every job, but still as often as we can to keep the memory use in check.
-    gc = Thread.new do
-      loop do
-        break if stopping?
-        GC.start if (@execution_counter.to_i % @num_threads).zero?
-        sleep 0.5
-      end
-    end
-    
-    @threads = [provider, gc] + consumers
+    @threads = consumers + [provider]
     
     # If any of our threads are already dead, it means there is some misconfiguration and startup failed
     if @threads.any?{|t| !t.alive? }
@@ -153,6 +142,16 @@ class Sqewer::Worker
   def stop
     @state.transition! :stopping
     @logger.info { '[worker] Stopping (clean shutdown), will wait for threads to terminate'}
+    loop do
+      n_live = @threads.select(&:alive?).length
+      break if n_live.zero?
+      
+      n_dead = @threads.length - n_live
+      @logger.info {"Waiting on threads to terminate, %d still alive, %d quit" % [n_live, n_dead] }
+      
+      sleep 2
+    end
+    
     @threads.map(&:join)
     @logger.info { '[worker] Stopped'}
     @state.transition! :stopped

data/sqewer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sqewer 2.0.1 ruby lib
+# stub: sqewer 2.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sqewer"
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2016-01-21"
+  s.date = "2016-01-23"
   s.description = "Process jobs from SQS"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqewer
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk