capistrano_sentinel 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf3d9ba70d682b6e0275772bab32bebea1b72e1
-  data.tar.gz: 293c43d87372e8ea2c47f9a4d5587e12966ef10d
+  metadata.gz: 63fcb2c5390ee0635ba551de92f6c76e30fe91a6
+  data.tar.gz: 927e880f797908adde7bf04661b007bdb7bd64c8
 SHA512:
-  metadata.gz: 5bb6dd4379df9661399068cfdff4c2add3f94f780c393e3e5c6595b5b7337361d803cd7aa4cfb611ad07c45db1e57137445390a5449f8a8831335c97f0c66321
-  data.tar.gz: 54eead5c4ab4d8d0e62bcc808bfead80138280303ae3633735832a7158c45dbf30af8df5725fba2910184026ee573443b473aff388e87d6fb6acceb1cfe046b6
+  metadata.gz: f56cc17119271efc5284be61cec30a2e5bb0bbeb3e3a0560a358d74853e516112403e921f30ead635b11cfbf12a8d44a0a97a68c6e055197c104e3ffd446ae88
+  data.tar.gz: 31226b6fc03cbb04cf43694b5d82c5fbd6baf5ebcf05280cdd690e534906c615bbc89ed4ed4fccef35f81695b07587da25ee361f4662a737eca520a2108d6cc4

data/lib/capistrano_sentinel/classes/request_hooks.rb

@@ -5,6 +5,14 @@ module CapistranoSentinel
   # class used to handle the rake worker and sets all the hooks before and after running the worker
   class RequestHooks
 
+    def self.job_id
+      ENV[CapistranoSentinel::RequestHooks::ENV_KEY_JOB_ID]
+    end
+
+    def self.socket_client
+      @@socket_client ||= CapistranoSentinel::WebsocketClient.new(actor: nil, enable_debug: ENV.fetch('debug_websocket', false), channel: "#{CapistranoSentinel::RequestHooks::SUBSCRIPTION_PREFIX}#{job_id}", log_file_path: ENV.fetch('websocket_log_file_path', nil))
+    end
+
     ENV_KEY_JOB_ID = 'multi_cap_job_id'
     SUBSCRIPTION_PREFIX ="rake_worker_"
     PUBLISHER_PREFIX ="celluloid_worker_"
@@ -12,13 +20,14 @@ module CapistranoSentinel
     attr_accessor :job_id, :task
 
     def initialize(task = nil)
-      @job_id  = ENV[CapistranoSentinel::RequestHooks::ENV_KEY_JOB_ID]
+      @job_id  = CapistranoSentinel::RequestHooks.job_id
       @task = task.respond_to?(:fully_qualified_name) ? task.fully_qualified_name : task
     end
 
     def automatic_hooks(&block)
       if job_id.present? && @task.present?
-        actor_start_working(action: 'invoke')
+        subscribed_already = defined?(@@socket_client)
+        actor_start_working(action: 'invoke', subscribed: subscribed_already)
         actor.wait_execution until actor.task_approved
         actor_execute_block(&block)
       else

data/lib/capistrano_sentinel/classes/request_worker.rb

@@ -12,7 +12,8 @@ module CapistranoSentinel
     def work(options = {})
       @options = options.stringify_keys
       default_settings
-      socket_client.subscribe("#{CapistranoSentinel::RequestHooks::SUBSCRIPTION_PREFIX}#{@job_id}")
+      socket_client.actor = self
+      publish_to_worker(task_data) if options['subscribed'].present?
     end
 
     def wait_execution(name = task_name, time = 0.1)
@@ -28,7 +29,7 @@ module CapistranoSentinel
     end
 
     def socket_client
-      @socket_client = CapistranoSentinel::WebsocketClient.new(actor: self, enable_debug: ENV.fetch('debug_websocket', false), channel: nil, log_file_path: ENV.fetch('websocket_log_file_path', nil))
+      @socket_client = CapistranoSentinel::RequestHooks.socket_client
     end
 
     def default_settings
@@ -52,6 +53,7 @@ module CapistranoSentinel
     end
 
     def publish_to_worker(data)
+      log_to_file("RakeWorker #{@job_id} tries to publish #{data.inspect}")
       socket_client.publish("#{CapistranoSentinel::RequestHooks::PUBLISHER_PREFIX}#{@job_id}", data)
     end
 
@@ -101,10 +103,11 @@ module CapistranoSentinel
     def task_approval(message)
       return if !message_is_about_a_task?(message)
       log_to_file("RakeWorker #{@job_id} #{task_name} task_approval : #{message.inspect}")
-      if @job_id.to_s == message['job_id'].to_s && message['task'] && message['approved'] == 'yes'
+      if @job_id.to_s == message['job_id'].to_s && message['task'].to_s == task_name.to_s && message['approved'] == 'yes'
+        show_warning "#{self.inspect} got #{message} and approved"
         @task_approved = true
       else
-        show_warning "unknown task_approval #{message} #{task_data}"
+        show_warning "#{self.inspect} got unknown task_approval #{message} #{task_data}"
       end
     end
 

data/lib/capistrano_sentinel/classes/websocket_client.rb

@@ -16,8 +16,8 @@ module CapistranoSentinel
       retry_time: 0
     }
 
-    attr_reader :socket, :read_thread,  :protocol_version
-    attr_accessor :auto_pong, :on_ping, :on_error, :on_message
+    attr_reader :socket, :read_thread,  :protocol_version, :actor
+    attr_accessor :auto_pong, :on_ping, :on_error, :on_message, :actor
 
     ##
     # +host+:: Host of request. Required if no :url param was provided.
@@ -42,7 +42,6 @@ module CapistranoSentinel
 
       @actor ||=  @options.fetch(:actor, nil)
       @channel ||= @options.fetch(:channel, nil)
-      raise "#{self}: Please provide an actor in the options list!!!" if @actor.blank?
 
 
       @auto_pong   = @options.fetch(:auto_pong, true) || true
@@ -56,7 +55,7 @@ module CapistranoSentinel
 
       @on_close   = lambda { |message|
         log_to_file("native websocket client received on_close  #{message.inspect}")
-        if @actor.respond_to?(:on_close)
+        if @actor.present? && @actor.respond_to?(:on_close)
           if @actor.respond_to?(:async)
             @actor.async.on_close(message)
           else
@@ -67,7 +66,7 @@ module CapistranoSentinel
 
       @on_ping    = lambda { |message|
         log_to_file("native websocket client received PING  #{message.inspect}")
-        if @actor.respond_to?(:on_ping)
+        if @actor.present? && @actor.respond_to?(:on_ping)
           if @actor.respond_to?(:async)
             @actor.async.on_ping(message)
           else
@@ -78,7 +77,7 @@ module CapistranoSentinel
 
       @on_error   = lambda { |error|
         log_to_file("native websocket client received ERROR  #{error.inspect} #{error.backtrace}")
-        if @actor.respond_to?(:on_error)
+        if @actor.present? && @actor.respond_to?(:on_error)
           if @actor.respond_to?(:async)
             @actor.async.on_error(error)
           else
@@ -89,8 +88,8 @@ module CapistranoSentinel
 
       @on_message = lambda { |message|
         message = parse_json(message)
-        log_to_file("native websocket client received JSON  #{message}")
-        if @actor.respond_to?(:async)
+        log_to_file("#{@actor.inspect} websocket client received JSON  #{message}")
+        if @actor.present? && @actor.respond_to?(:async)
           @actor.async.on_message(message)
         else
           @actor.on_message(message)
@@ -184,7 +183,7 @@ module CapistranoSentinel
         final_message = JSON.dump(action: 'message', message: message)
       end
       log_to_file("#{@actor.class} sends JSON #{final_message}")
-      send(final_message)
+      send_data(final_message)
     end
 
     ##
@@ -193,9 +192,9 @@ module CapistranoSentinel
     #if on windows fork won't be attempted.
     #+data+:: the data to send
     #+type+:: :text or :binary, defaults to :text
-    def send(data, type = :text)
+    def send_data(data, type = :text)
       pid = Thread.new do
-        log_to_file("#{@actor.class} calls send: #{data}")
+        log_to_file("#{@actor.inspect} calls send: #{data}")
         do_send(data, type)
       end
     end
@@ -232,6 +231,8 @@ module CapistranoSentinel
       end
     end
 
+
+
     def perform_handshake
       handshake = ::WebSocket::Handshake::Client.new({
         :host   => @host,
@@ -310,7 +311,7 @@ module CapistranoSentinel
         when :binary, :text
           fire_on_message(message.data)
         when :ping
-          send(message.data, :pong) if @auto_pong
+          send_data(message.data, :pong) if @auto_pong
           fire_on_ping(message)
         when :pong
           fire_on_error(CapistranoSentinel::WsProtocolError.new('Invalid type pong received'))

data/lib/capistrano_sentinel/version.rb

@@ -17,7 +17,7 @@ module CapistranoSentinel
     # minor release version
     MINOR = 0
     # tiny release version
-    TINY = 5
+    TINY = 6
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_sentinel
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket