rookout 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a651effede1b4bb60cf30bcc0ad23adac929ebb41ac69e0e059acc988542defc
-  data.tar.gz: dd89562cd624e99ee1dbac58a9f045ee49175ccf12b9341df5cd0fbae1122774
+  metadata.gz: bb5339cdc9cb66af897ace6857663f6c784809a17948e17a854f7b204fc9c4a1
+  data.tar.gz: d80f3651e6284b7b2262a4f092b7f41b96d7fc45ada08ff1b70a4e1a1efe1304
 SHA512:
-  metadata.gz: 42e4512c638fa18f2e75ac71154422a6a4a953ac013f070dfe07276f582aa695336baff015233df77bfe3daa36c44784ba65147c5d89682eacd6d985fa7d63aa
-  data.tar.gz: 71926999899dd01a46af82f6ac5884f543b56804e91559f7085256e09d9a172541baf55b3f0a712d06b9997e3ec9f90ac372a028c5a4bf5839a539b17e5d6497
+  metadata.gz: 05c9290a00720940c4f3782126dd3d59d346bddf417e41334b00a3386d7ab14274a06f4744ddb89dad81ab65c0074ae99a13e799dceddd57c54c33a93ffef81a
+  data.tar.gz: 50f822a8bac76ead40a06595a8467661c4ac6718d72e270d2c5b88abbadd1e4754e06ff54d3e8d89a9397faabb2a208f9b97ef3d808c1ecd9c890560e781277b

data/lib/rookout/atfork.rb

@@ -0,0 +1,73 @@
+module Rookout
+  class ForkManager
+    require "singleton"
+    include Singleton
+
+    def initialize
+      @active = false
+    end
+
+    def activate!
+      @active = true
+    end
+
+    def disable!
+      @active = false
+    end
+
+    def active?
+      @active
+    end
+
+    def fork_hook original_fork
+      if block_given?
+        original_fork.call do
+          post_fork_child if active?
+          yield
+        end
+      else
+        res = original_fork.call
+        post_fork_child if active? && !res
+        res
+      end
+    end
+
+    def post_fork_child
+      require_relative "rookout_singleton"
+      require_relative "interface"
+
+      RookoutSingleton.instance.post_fork_clean
+      Interface.instance.stop
+      Interface.instance.start post_fork: true
+
+      # Disable fork handler in child process
+      disable!
+    end
+  end
+end
+
+alias _rookout_original_fork fork
+
+def self.fork &block
+  Rookout::ForkManager.instance.fork_hook method(:_rookout_original_fork), &block
+end
+
+def fork &block
+  Rookout::ForkManager.instance.fork_hook method(:_rookout_original_fork), &block
+end
+
+module Kernel
+  alias _rookout_original_fork fork
+
+  def self.fork &block
+    Rookout::ForkManager.instance.fork_hook method(:_rookout_original_fork), &block
+  end
+end
+
+module Process
+  alias _rookout_original_fork fork
+
+  def self.fork &block
+    Rookout::ForkManager.instance.fork_hook method(:_rookout_original_fork), &block
+  end
+end

data/lib/rookout/augs/aug.rb

@@ -7,6 +7,7 @@ module Rookout
     require_relative "../processor/namespaces/container_namespace"
     require_relative "../processor/namespaces/ruby_utils_namespace"
     require_relative "../processor/namespaces/noop_namespace"
+    require_relative "../logger"
 
     class Aug
       def initialize aug_id, action, condition, rate_limiter, _max_aug_time
@@ -32,6 +33,7 @@ module Rookout
 
         @rate_limiter.with_limit do
           report_id = Utils.uuid
+          Logger.instance.info "Executing aug-\t#{id} (msg ID #{report_id})"
           @action.execute @id, report_id, namespace, output
         end
       end

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -39,7 +39,8 @@ module Rookout
         @info = Information.new labels
         reset_id
 
-        @thread = nil
+        @main_thread = nil
+        @outgoing_thread = nil
         @pending_messages = Queue.new
 
         @running = false
@@ -64,8 +65,17 @@ module Rookout
       def connect
         @running = true
 
-        @thread = Thread.new { connection_thread }
-        @thread.name = "rookout-connection-thread"
+        @main_thread = Thread.new { connection_thread }
+        @main_thread.name = "rookout-connection-thread"
+      end
+
+      def stop
+        @running = false
+
+        # Ask outgoing thread to exit (if running)
+        @pending_messages << ExitMessage.new(@outgoing_thread)
+
+        @main_thread.join
       end
 
       def wait_for_ready
@@ -133,8 +143,8 @@ module Rookout
 
       def connection_pump client
         on_outgoing_exit = proc { client.close }
-        send_thread = Thread.new { outgoing client, on_outgoing_exit }
-        send_thread.name = "rookout-outgoing-thread"
+        @outgoing_thread = Thread.new { outgoing client, on_outgoing_exit }
+        @outgoing_thread.name = "rookout-outgoing-thread"
 
         message_handler = proc do |raw_message|
           envelope = Com::Rookout::Envelope.decode raw_message.pack("c*")
@@ -150,7 +160,8 @@ module Rookout
         Logger.instance.debug "Incoming loop - socket disconnected"
 
         @pending_messages.push ExitMessage.new(send_thread)
-        send_thread.join
+        @outgoing_thread.join
+        @outgoing_thread = nil
       end
 
       def outgoing client, on_exit

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "2a847bf58dabb4d6abd2957f4c382256a4a467db".freeze
+  COMMIT = "1ef929297eb0815aa058874e7a9a342c77062fdf".freeze
 end

data/lib/rookout/exceptions.rb

@@ -105,7 +105,7 @@ module Rookout
     end
 
     class RookInvalidToken < ToolException
-      def initialize token
+      def initialize token = ""
         super "The Rookout token supplied #{token[0..6]} is not valid; please check the token and try again",
               { token: token[0...6] }
       end
@@ -114,7 +114,7 @@ module Rookout
     class RookSourceFilePathSuggestion < ToolException
       def initialize wanted_path, matching_path
         super "Rookout found alternative file path: #{matching_path}",
-              { wanted_path: wanted_path, matching_path: matching_path }
+              { "wanted_path" => wanted_path, "matching_path" => matching_path }
       end
     end
 

data/lib/rookout/interface.rb

@@ -9,6 +9,7 @@ module Rookout
 
     def initialize
       @rook = nil
+      @start_options = nil
     end
 
     def start options = {}
@@ -19,14 +20,20 @@ module Rookout
       begin
         require_relative "rookout_singleton"
 
-        configure_logging options
-        configure_git options
+        # If we are running post fork, use previous start_options
+        if options[:post_fork]
+          # Don't re-enable the fork handler
+          @start_options[:fork] = false
+        else
+          configure_logging options
+          configure_git options
 
-        start_options = configure_start_options options
-        print_config start_options
+          @start_options = configure_start_options options
+          print_config @start_options
+        end
 
         rook = RookoutSingleton.instance
-        rook.connect(**start_options)
+        rook.connect(**@start_options)
       rescue RookMissingToken, RookInvalidToken, RookInvalidOptions, RookVersionNotSupported => e
         raise if throw_errors
         STDERR.puts "[Rookout] Failed to start Rookout: #{e.message}"

data/lib/rookout/rookout_singleton.rb

@@ -40,9 +40,14 @@ module Rookout
       @services_started = false
     end
 
-    def connect token: nil, host: nil, port: nil, proxy: nil, labels: [], async_start: false, **_
+    def connect token: nil, host: nil, port: nil, proxy: nil, labels: [], async_start: false, fork: false
       raise Exceptions::RookInterfaceException, "Multiple connection attempts not supported!" unless @agent_com.nil?
 
+      if fork
+        require_relative "atfork"
+        Rookout::ForkManager.instance.activate!
+      end
+
       start_trigger_services
 
       Logger.instance.debug "Initiating AgentCom-\t#{host}:#{port}"
@@ -61,6 +66,16 @@ module Rookout
       @output.flush_messages if !@output.nil && !@agent_com.nil?
     end
 
+    def post_fork_clean
+      @agent_com.stop
+      @agent_com = nil
+
+      @command_handler = nil
+
+      # We don't disable services because we will lose all loaded scripts
+      @services.clear_augs
+    end
+
     attr_reader :services
 
     private

data/lib/rookout/services/position.rb

@@ -102,13 +102,16 @@ module Rookout
         elsif suggested_match? location, filename
           warning = Exceptions::RookSourceFilePathSuggestion.new location.filename, filename
           location.notify_warning warning
+          # Must return nil in order to skip this script
+          nil
         end
       end
 
       #########################################################################################
       # Utils
       def exact_match? location_filename, script_filename
-        script_filename.end_with? location_filename
+        return unless script_filename.end_with? location_filename
+        File.basename(script_filename) == File.basename(location_filename)
       end
 
       def suggested_match? location, filename

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: google-protobuf
+  name: event_emitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
-  name: event_emitter
+  name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 3.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 3.9.2
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,7 @@ files:
 - LICENSE
 - bin/rookout
 - lib/rookout.rb
+- lib/rookout/atfork.rb
 - lib/rookout/augs/actions/action.rb
 - lib/rookout/augs/actions/action_run_processor.rb
 - lib/rookout/augs/aug.rb