hanami-events-cloud_pubsub 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e32a098f1de2fd09c4bc5c6426de01c1b1f2901
-  data.tar.gz: ee797299d3b807a971ba55c26c56c2df39d42a71
+  metadata.gz: 5c1e904f1c495c8ec63738657cffec7235f9ac37
+  data.tar.gz: cc8260aba559598abff5cedeec6cc59e4514cf07
 SHA512:
-  metadata.gz: 947616cdbd3ca4a37918db0071306f24411c06ebb351b0b5b8364c2b8660c4fab4e4959e10367d45d6e676f2ee2f6169bd86a5d7fdceb6539b085b77273c400b
-  data.tar.gz: e47ed44cf294950d6c087443587e5f0b3c05e76f58c9f92aadbc167e728071fa016f4b742858cd680652f1021365a60315d5ebc9745950ad2111f8a7b1444466
+  metadata.gz: 90585ecfef0ea10e61674e7e3671633a5feaa1b5f1437b7952bf01b1a001314b30652d3df20cfb4eccafef5b8e6de26832b0114bfd47a7aafaad6b58bea777a7
+  data.tar.gz: 69a520f5ed0fd98029bd6de9496f326d384ca2fb2717ee82635aacaca2113b70a5a9a83244077afbbd7f4d563e7f0a6f93a0dcec6fe937d86099f828161078e9

data/Gemfile.lock

@@ -9,11 +9,12 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (0.2.1)
-      dry-configurable
+    hanami-events-cloud_pubsub (0.2.2)
+      dry-configurable (~> 0.7.0)
       google-cloud-pubsub (~> 0.30.2)
-      hanami-cli
-      hanami-events
+      hanami-cli (~> 0.2.0)
+      hanami-events (~> 0)
+      rack (~> 2.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -75,7 +76,7 @@ GEM
     hanami-utils (1.2.0)
       concurrent-ruby (~> 1.0)
       transproc (~> 1.0)
-    jaro_winkler (1.4.0)
+    jaro_winkler (1.5.1)
     json (2.1.0)
     jwt (2.1.0)
     little-plugger (1.1.4)
@@ -95,6 +96,7 @@ 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)
@@ -111,8 +113,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.57.0)
-      jaro_winkler (~> 1.4.0)
+    rubocop (0.57.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)

data/examples/server.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 Hanami::Events::CloudPubsub.configure do |config|
+  config.subscriber.streams = 2
+  config.subscriber.threads.push = 2
+  config.subscriber.threads.callback = 2
+
   config.subscriptions_loader = -> do
     $events.subscribe('user.deleted', id: 'testing-2') do |payload|
       puts "Deleted2 user: #{payload}"

data/hanami-events-cloud_pubsub.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dry-configurable'
+  spec.add_dependency 'dry-configurable', '~> 0.7.0'
   spec.add_dependency 'google-cloud-pubsub', '~> 0.30.2'
-  spec.add_dependency 'hanami-cli'
-  spec.add_dependency 'hanami-events'
+  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.rb

@@ -13,6 +13,13 @@ module Hanami
     module CloudPubsub
       extend Dry::Configurable
 
+      setting :subscriber, reader: true do
+        setting :streams, 4
+        setting :threads do
+          setting :callback, 8
+          setting :push, 4
+        end
+      end
       setting :project_id, reader: true
       setting :logger, Logger.new(STDOUT), reader: true
       setting :subscriptions_loader, proc {

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

@@ -2,6 +2,7 @@
 
 require 'hanami/cli'
 require 'hanami/events/cloud_pubsub'
+require 'hanami/events/cloud_pubsub/health_check_server'
 
 module Hanami
   module Events
@@ -13,6 +14,13 @@ module Hanami
 
           # Command to run the worker
           class Run < Hanami::CLI::Command
+            attr_reader :runner
+
+            def initialize(*args)
+              super
+              @event_queue = Queue.new
+            end
+
             option :emulator,
                    type: :boolean,
                    default: false,
@@ -35,6 +43,7 @@ module Hanami
               load_subscriptions
               setup_signal_handlers
               start_runner
+              start_server
               sleep_forever
             end
 
@@ -49,18 +58,18 @@ module Hanami
               CloudPubsub.setup
             end
 
+            def start_server
+              server = HealthCheckServer.new(runner, logger)
+              on_shutdown = proc { @event_queue << proc { shutdown } }
+              server.run_in_background(on_shutdown: on_shutdown)
+              server
+            end
+
             def sleep_forever
-              thread = Thread.new do
-                loop do
-                  event = @queue.pop
-                  event.call
-                end
+              until finished_shutting_down?
+                event = @event_queue.pop
+                event.call
               end
-
-              sleep
-            rescue Interrupt
-              thread.kill
-              shutdown
             end
 
             def load_config
@@ -72,7 +81,7 @@ module Hanami
             def start_runner
               logger.debug 'Running in emulator mode' if @emulator
               logger.info "Starting worker (pid: #{Process.pid})"
-              @runner.start
+              runner.start
             end
 
             def parse_opts(opts)
@@ -100,24 +109,20 @@ module Hanami
             end
 
             def setup_signal_handlers
-              @queue = Queue.new
-
-              Signal.trap('TSTP') do
-                @queue << proc { @runner.pause }
-              end
-
-              Signal.trap('CONT') do
-                @queue << proc { @runner.start }
-              end
-
-              Signal.trap('TTIN') do
-                @queue << proc { @runner.print_debug_info }
-              end
+              Signal.trap('TSTP') { @event_queue << runner.method(:pause) }
+              Signal.trap('TTIN') { @event_queue << runner.method(:print_debug_info) }
+              Signal.trap('INT')  { @event_queue << method(:shutdown) }
             end
 
             def shutdown
               STDOUT.flush
-              @runner.gracefully_shutdown
+              runner.gracefully_shutdown
+            ensure
+              @finished_shutting_down = true
+            end
+
+            def finished_shutting_down?
+              @finished_shutting_down == true
             end
           end
 

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'rack'
+
+module Hanami
+  module Events
+    module CloudPubsub
+      # Simple server for health checks
+      class HealthCheckServer
+        def initialize(runner, logger)
+          @runner = runner
+          @logger = logger
+        end
+
+        def start
+          @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) }
+
+          Concurrent::Promise.execute(on_reject: log_error) do
+            server.start
+            on_shutdown.call(server)
+          end
+        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)
+
+          Rack::Builder.app do
+            run 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]
+        end
+      end
+    end
+  end
+end

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

@@ -14,7 +14,8 @@ module Hanami
                     :subscriber_id,
                     :logger,
                     :handler,
-                    :event_name
+                    :event_name,
+                    :subscriber_opts
 
         def initialize(topic:, logger:, handler:, event_name:, subscriber_id:)
           @topic = topic
@@ -22,12 +23,13 @@ module Hanami
           @handler = handler
           @event_name = event_name
           @subscriber_id = subscriber_id
+          @subscriber_opts = CloudPubsub.config.subscriber.to_h
         end
 
         def register
           subscription = subscription_for(subscriber_id)
 
-          listener = subscription.listen do |message|
+          listener = subscription.listen(subscriber_opts) do |message|
             handle_message(message)
           end
 
@@ -97,7 +99,7 @@ module Hanami
         def subscription_for(name)
           topic.create_subscription(name)
         rescue Google::Cloud::AlreadyExistsError
-          # OK
+          topic.find_subscription(name)
         end
 
         def ensure_subscriber!

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

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '0.2.1'
+      VERSION = '0.2.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -14,16 +14,16 @@ dependencies:
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +42,44 @@ dependencies:
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: hanami-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !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
@@ -138,6 +152,7 @@ files:
 - lib/hanami/events/cloud_pubsub.rb
 - lib/hanami/events/cloud_pubsub/cli.rb
 - lib/hanami/events/cloud_pubsub/handler.rb
+- lib/hanami/events/cloud_pubsub/health_check_server.rb
 - lib/hanami/events/cloud_pubsub/listener.rb
 - lib/hanami/events/cloud_pubsub/mixin.rb
 - lib/hanami/events/cloud_pubsub/runner.rb