hanami-events-cloud_pubsub 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a054059dd8bf27cccccc92f417df3761a54fd9
-  data.tar.gz: 49e74a3600f6e1ad33d95afb64f4553c1a6f8040
+  metadata.gz: 88120cf9f817872c49197ae567f89522ea1f4b2a
+  data.tar.gz: 758ef846e83c6fc98167d57935035746126b9cec
 SHA512:
-  metadata.gz: ca596841b1e75b421f9ce5beca750538dbf1223a43b082caad96b6c8c63c0255bee763515f0aec0f08998fdfd459565454a309aa2a5d50cb269d4eb3b2972d14
-  data.tar.gz: 6f7bee64cb6eb48929b8a2efbec2b8d9f73e2cb887536001577b705cc8d7b596e50654e0d6907fc58140ca4d6a2de4a81cf3fce875da3496b6059187c2401d39
+  metadata.gz: 9e303a3232233768644db08dfc82b71dff839240c983c0f097d778b514a8613331116baa6906ddc9cf8ccb0146b8278f698e63c055b8b900ea1fb05b52cd5190
+  data.tar.gz: 7daa16544379cbf1a72d05bd8eb558285899c102fbf0fe99302a80629678daaa3d56acda34030830aac9339c6663c9a37e3aa4f8085c9c05083c5a6733a00d0e

data/Gemfile.lock

@@ -9,12 +9,11 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (0.2.5)
+    hanami-events-cloud_pubsub (0.2.6)
       dry-configurable (~> 0.7.0)
       google-cloud-pubsub (~> 0.30.2)
       hanami-cli (~> 0.2.0)
       hanami-events (~> 0)
-      rack (~> 2.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -95,7 +94,6 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    rack (2.0.5)
     rainbow (3.0.0)
     rake (12.3.1)
     rly (0.2.3)

data/hanami-events-cloud_pubsub.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'google-cloud-pubsub', '~> 0.30.2'
   spec.add_dependency 'hanami-cli', '~> 0.2.0'
   spec.add_dependency 'hanami-events', '~> 0'
-  spec.add_dependency 'rack', '~> 2.0.5'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 12.3'

data/lib/hanami/events/cloud_pubsub/health_check_server.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rack'
+require 'webrick'
 
 module Hanami
   module Events
@@ -13,44 +13,44 @@ module Hanami
         end
 
         def start
-          @logger.info 'Starting healthcheck server on port 0.0.0.0:8080'
+          logger.info 'Starting healthcheck server on port 0.0.0.0:8080'
           server.start
         end
 
-        def run_in_background(on_shutdown:)
-          log_error = proc { |err| logger.error(err.message) }
+        def shutdown
+          logger.info 'Shutting down healthcheck server'
+          server.shutdown
+        end
 
-          Concurrent::Promise.execute(on_reject: log_error) do
-            server.start
-            on_shutdown.call(server)
+        def run_in_background(on_shutdown: nil)
+          prom = Concurrent::Promise.execute do
+            start
+            on_shutdown&.call(server)
           end
+
+          prom.catch { |err| logger.error(err) }
         end
 
         private
 
-        def server
-          @server ||= Rack::Server.new(
-            Port: 8080,
-            Host: '0.0.0.0',
-            quiet: true,
-            app: app
-          )
-        end
-
-        def app
-          health_endpoint = method(:health_endpoint)
+        attr_reader :logger, :runner
 
-          Rack::Builder.app do
-            run health_endpoint
-          end
+        def server
+          @server ||=
+            WEBrick::HTTPServer.new(
+              Port: 8080,
+              BindAddress: '0.0.0.0',
+              Logger: WEBrick::Log.new('/dev/null'),
+              AccessLog: []
+            ).tap do |srv|
+              srv.mount_proc '/', method(:health_endpoint)
+            end
         end
 
-        def health_endpoint(_env)
-          status = @runner.healthy? ? 200 : 503
-          headers = { 'Content-Type' => 'text/html' }
-          body = [status.to_s]
-
-          [status, headers, body]
+        def health_endpoint(_req, res)
+          res['Content-Type'] = 'text/plain'
+          res.status = runner.healthy? ? 200 : 503
+          res.body = res.status.to_s
         end
       end
     end

data/lib/hanami/events/cloud_pubsub/runner.rb

@@ -25,11 +25,8 @@ module Hanami
         # Will be called on TSTP
         #
         # Stop processing new events (unsubscribe from topics, etc)
-        #
-        # For example, if you needed to restart a Redis server you could first
-        # call pause to allow for a safe restart of the runner.
-        def pause
-          logger.info 'Pausing CloudPubsub runner'
+        def stop
+          logger.info 'Stopping CloudPubsub listeners'
           adapter.listeners.each(&:stop)
           self
         end
@@ -40,7 +37,7 @@ module Hanami
         # waiting for messages to finish processing, etc. If this method succesfully
         # runs, there should be no potential for undefined behavior.
         def gracefully_shutdown
-          pause
+          stop
           logger.info "Gracefully shutting down CloudPubsub runner: #{self}"
           sleep_for_a_bit
           adapter.flush_messages

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '0.2.5'
+      VERSION = '0.2.6'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement