receptor_controller-client 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f99fb38eec5c760bd12813db5026e87e6a344965ecc95e64c73599a14fd369de
-  data.tar.gz: a494ce84703f398a2716b7bde039b4d5cffe7a0390128ebdc660c2953998bbbd
+  metadata.gz: f41b7d6f4bd570860329519b76db11ce76e7fd1938d05195d32700a88b373b4d
+  data.tar.gz: 3720db1535834c0ad565aed6f1d9d6b99a78395b46cfd11be65ab29dc2ce5942
 SHA512:
-  metadata.gz: 26d9b2d4728bbb03b84903d9642937123a3a6226e1c7765d97cc3b0cdc618e75b92d3c35e1642b6d91fa95b74e8459f93cac4e96496e8e275cdb7cefe7a01511
-  data.tar.gz: 9761de4851573e324966bde349ff0da97072cf220c81f57d8586c09616c5618f085e30f987489763bfa443013130542930c01a73c4cfaf18a9a538c7ef34c8bb
+  metadata.gz: e08b4c2d9590b7ec470a5703432d6504ed928fefc219adee040df5db9d9c5fa69d31e0f5f1ab6a8476ec981c694b111999ab27be484fe005228c3e9b7e25e401
+  data.tar.gz: 4ac74ec793767207779c7cb6d952712d4335c87ee249638cf714ce3a30775e3b18a96b114ead27585fe026da52077a78b6c5bb9997176d3f06f092d7f37912af

data/CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.0.6]
+- Waiting for response-worker kafka init #20
+- Fix href_slug in directives log #29
 
 ## [0.0.5] - 2020-08-11
 ### Added
@@ -24,7 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Added extra logging for messages
 
-[Unreleased]: https://github.com/RedHatInsights/receptor_controller-client-ruby/compare/v0.0.5...HEAD
+[Unreleased]: https://github.com/RedHatInsights/receptor_controller-client-ruby/compare/v0.0.6...HEAD
+[0.0.6]: https://github.com/RedHatInsights/receptor_controller-client-ruby/releases/tag/v0.0.6
 [0.0.5]: https://github.com/RedHatInsights/receptor_controller-client-ruby/releases/tag/v0.0.5
 [0.0.4]: https://github.com/RedHatInsights/receptor_controller-client-ruby/releases/tag/v0.0.4
 [0.0.3]: https://github.com/RedHatInsights/receptor_controller-client-ruby/releases/tag/v0.0.3

data/lib/receptor_controller/client/directive_blocking.rb

@@ -20,7 +20,7 @@ module ReceptorController
 
       msg_id = JSON.parse(response.body)['id']
 
-      logger.debug("Receptor response [#{ReceptorController::Client::Configuration.default.queue_persist_ref}]: registering message #{msg_id}, href_slug: #{body[:payload]["href_slug"]}")
+      logger.debug("Receptor response [#{ReceptorController::Client::Configuration.default.queue_persist_ref}]: registering message #{msg_id}, href_slug: #{log_message_common}")
       # registers message id for kafka responses
       response_worker.register_message(msg_id, self)
       wait_for_response(msg_id)

data/lib/receptor_controller/client/directive_non_blocking.rb

@@ -48,7 +48,7 @@ module ReceptorController
 
         # registers message id for kafka responses
         response_worker.register_message(msg_id, self)
-        logger.debug("Receptor response [#{ReceptorController::Client::Configuration.default.queue_persist_ref}]: registering message #{msg_id}, href_slug: #{body[:payload]["href_slug"]}")
+        logger.debug("Receptor response [#{ReceptorController::Client::Configuration.default.queue_persist_ref}]: registering message #{msg_id}, href_slug: #{log_message_common}")
 
         msg_id
       else

data/lib/receptor_controller/client/response_worker.rb

@@ -1,3 +1,4 @@
+require 'active_support/notifications'
 require 'base64'
 require "concurrent"
 require 'stringio'
@@ -20,6 +21,7 @@ module ReceptorController
   class Client::ResponseWorker
     EOF = "eof".freeze
     RESPONSE = "response".freeze
+    INITIALIZATION_TIMEOUT = 20
 
     attr_reader :started
     alias started? started
@@ -39,13 +41,23 @@ module ReceptorController
 
     # Start listening on Kafka
     def start
+      init_lock, init_wait = Mutex.new, ConditionVariable.new
+
       lock.synchronize do
         return if started.value
 
+        default_messaging_opts # Thread-safe init
+        init_notifications(init_lock, init_wait)
+
         started.value         = true
         workers[:maintenance] = Thread.new { check_timeouts while started.value }
         workers[:listener]    = Thread.new { listen while started.value }
       end
+
+      # Wait for kafka initialization
+      wait_for_notifications(init_lock, init_wait)
+
+      logger.info("Receptor Response worker started...")
     end
 
     # Stop listener
@@ -59,6 +71,36 @@ module ReceptorController
       end
     end
 
+    # Listening for the consumer call to the Fetch API
+    # Then releasing original starting thread
+    def init_notifications(init_lock, init_wait)
+      logger.info("Initializing Receptor kafka client...")
+      start_time = Time.now.utc
+      ActiveSupport::Notifications.subscribe('request.connection.kafka') do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        if default_messaging_opts[:client_ref] == event.payload[:client_id]
+          if event.payload[:api] == :fetch
+            logger.info "Receptor Kafka client successfully initialized "
+            # initialized, unsubscribe notifications
+            ActiveSupport::Notifications.unsubscribe('request.connection.kafka')
+            init_lock.synchronize { init_wait.signal }
+          end
+        end
+
+        if start_time <= INITIALIZATION_TIMEOUT.seconds.ago.utc
+          ActiveSupport::Notifications.unsubscribe('request.connection.kafka')
+          logger.error("Receptor Kafka client initialization timeout...")
+          init_lock.synchronize { init_wait.signal }
+        end
+      end
+    end
+
+    def wait_for_notifications(init_lock, init_wait)
+      init_lock.synchronize do
+        init_wait.wait(init_lock)
+      end
+    end
+
     # Registers message_id received by request,
     # Defines response and timeout callback methods
     #
@@ -84,7 +126,6 @@ module ReceptorController
       # Open a connection to the messaging service
       client = ManageIQ::Messaging::Client.open(default_messaging_opts)
 
-      logger.info("Receptor Response worker started...")
       client.subscribe_topic(queue_opts) do |message|
         process_message(message)
       end
@@ -221,12 +262,14 @@ module ReceptorController
       @queue_opts               = {:service  => config.queue_topic,
                                    :auto_ack => config.queue_auto_ack}
       @queue_opts[:max_bytes]   = config.queue_max_bytes if config.queue_max_bytes
-      @queue_opts[:persist_ref] = config.queue_persist_ref if config.queue_persist_ref
+      @queue_opts[:persist_ref] = ENV['HOSTNAME']
       @queue_opts
     end
 
     def default_messaging_opts
-      {
+      return @default_messaging_opts if @default_messaging_opts
+
+      @default_messaging_opts = {
         :host       => config.queue_host,
         :port       => config.queue_port,
         :protocol   => :Kafka,

data/lib/receptor_controller/client/version.rb

@@ -1,5 +1,5 @@
 module ReceptorController
   class Client
-    VERSION = "0.0.5".freeze
+    VERSION = "0.0.6".freeze
   end
 end

data/spec/receptor_controller/directive_blocking_spec.rb

@@ -32,6 +32,10 @@ RSpec.describe ReceptorController::Client::DirectiveBlocking do
 
   subject { described_class.new(:name => directive, :account => external_tenant, :node_id => receptor_node, :payload => payload, :client => receptor_client) }
 
+  before do
+    allow(subject.response_worker).to receive_messages(:init_notifications => nil, :wait_for_notifications => nil)
+  end
+
   describe "#call" do
     it "makes POST /job request to receptor and registers received message ID" do
       allow(subject).to receive(:wait_for_response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: receptor_controller-client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Martin Slemr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport