spider-gazelle 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d98f7022babe544f38425eacb223337cef347ade
-  data.tar.gz: d214d5a1192828a1d272f7955817f64f9829c7b9
+  metadata.gz: 49d9e0d9dee57cc23287f2155e6ebe81137e3f15
+  data.tar.gz: 385f9ee18cdc18dab2b1de1f34b689968c617e8a
 SHA512:
-  metadata.gz: 659f91228f5efc1879874407ae54ea20c15df0b9129eb30f8d96b59b57c4979e2da5a4ff0b6686ecd701c4976b36903571156401c93b0c0384b218b08b249d5d
-  data.tar.gz: b4264bc65bad3ec4736f25d38b63e0e0ec3e37617b12f794936a9ed66f0081ef114d206856635e6778d991900c7edf9b6ae9d919baef132ff9407510a2ff28cb
+  metadata.gz: 932d6770571115d8e01d8e039725222929e7da5800be5d3ec9730505e97e1f8d153a76dfab4bbfb8ce8deea47993deb7d5a1797fabb7d869e5349c512108b6f7
+  data.tar.gz: 3b33aa02ef5fad6b922ef577e22c3b209cd6f2db336f85d74c666f75cc38574dec6db3ae7b76ce2ab1bd50b7af33fdbdc8d26893943f0e1982e3bb3303fff102

data/lib/spider-gazelle.rb

@@ -73,25 +73,21 @@ module SpiderGazelle
         # ---------------------------------------
         def launch_spider(args)
             require 'securerandom'
-            require 'thread'
 
             @password ||= SecureRandom.hex
-            #cmd = "#{EXEC_NAME} -s #{@password} #{Shellwords.join(args)}"
-            cmd = [EXEC_NAME, '-s', @password] + args
 
-            Thread.new do
-                result = system(*cmd)
+            #cmd = "#{EXEC_NAME} -s #{@password} #{Shellwords.join(args)}"
 
-                # TODO:: We need to detect a failed load
-                # This is a little more tricky as spiders
-                # may come and go without this process exiting
+            thread = Reactor.instance.thread
+            spider = thread.spawn(EXEC_NAME, args: (['-s', @password] + args), mode: :inherit)
+            spider.finally do
+                signaller = ::SpiderGazelle::Signaller.instance
+                signaller.panic!('Unexpected spider exit') unless signaller.shutting_down
             end
         end
 
         # This is called when a spider process starts
         def start_spider(signaller, logger, options)
-            logger.set_client signaller.pipe unless options[0][:isolate]
-
             require 'spider-gazelle/spider'
             Spider.instance.run!(options)
         end

data/lib/spider-gazelle/logger.rb

@@ -5,7 +5,7 @@ require 'libuv'
 module SpiderGazelle
     class Logger
         include Singleton
-        attr_reader :level, :thread, :pipe
+        attr_reader :level, :thread, :stdout
         attr_accessor :formatter
 
 
@@ -22,19 +22,14 @@ module SpiderGazelle
 
         def initialize
             @thread = ::Libuv::Reactor.default
+            @stdout = @thread.pipe
+            @stdout.open(1)
             @level = DEFAULT_LEVEL
-            @write = method(:server_write)
         end
 
 
         def self.log(data)
-            Logger.instance.server_write(data)
-        end
-
-
-        def set_client(uv_io)
-            @pipe = uv_io
-            @write = method(:client_write)
+            Logger.instance.stdout.write(data)
         end
 
         def level=(level)
@@ -83,7 +78,7 @@ module SpiderGazelle
         def verbose(msg = nil)
             if @verbose
                 msg = yield if block_given?
-                @write.call ">> #{msg}\n"
+                @stdout.write ">> #{msg}\n"
             end
         end
 
@@ -95,11 +90,6 @@ module SpiderGazelle
             error(message)
         end
 
-        # NOTE:: should only be called on reactor thread
-        def server_write(msg)
-            STDOUT.write msg
-        end
-
 
         protected
 
@@ -107,13 +97,8 @@ module SpiderGazelle
         def log(level, msg)
             output = "[#{level}] #{msg}\n"
             @thread.schedule do
-                @write.call output
+                @stdout.write output
             end
         end
-
-        # NOTE:: should only be called on reactor thread
-        def client_write(msg)
-            @pipe.write "\x02Logger log #{msg}\x03"
-        end
     end
 end

data/lib/spider-gazelle/reactor.rb

@@ -38,16 +38,17 @@ module SpiderGazelle
             end
 
             @thread.schedule do
-                return if @shutdown_called
-                @shutdown_called = true
+                if not @shutdown_called
+                    @shutdown_called = true
 
-                # Signaller will manage the shutdown of the gazelles
-                signaller = Signaller.instance.shutdown
-                signaller.finally do
-                    @thread.stop
-                    # New line on exit to avoid any ctrl-c characters
-                    # We check for pipe as we only want the master process to print this
-                    puts "\nSpider-Gazelle leaps through the veldt\n" unless @logger.pipe
+                    # Signaller will manage the shutdown of the gazelles
+                    signaller = Signaller.instance.shutdown
+                    signaller.finally do
+                        @thread.stop
+                        # New line on exit to avoid any ctrl-c characters
+                        # We check for pipe as we only want the master process to print this
+                        puts "\nSpider-Gazelle leaps through the veldt\n"
+                    end
                 end
             end
         end

data/lib/spider-gazelle/signaller.rb

@@ -8,7 +8,7 @@ module SpiderGazelle
         include Singleton
 
 
-        attr_reader   :thread, :pipe
+        attr_reader   :thread, :pipe, :is_connected, :shutting_down
         attr_accessor :gazelle
 
 
@@ -19,7 +19,8 @@ module SpiderGazelle
             # This is used to check if an instance of spider-gazelle is already running
             @is_master = false
             @is_client = false
-            @is_connected = false
+            @is_connected  = false
+            @shutting_down = false
             @client_check = @thread.defer
             @validated = [] # Set requires more processing
             @validating = {}
@@ -42,6 +43,7 @@ module SpiderGazelle
 
         def shutdown
             defer = @thread.defer
+            @shutting_down = true
 
             # Close the SIGNAL_SERVER pipe
             @pipe.close if @is_connected
@@ -115,7 +117,6 @@ module SpiderGazelle
             @pipe.finally do
                 if @is_client
                     @is_connected = false
-                    panic!(nil)
                 else
                     # Assume the role of master
                     become_sg_master
@@ -154,7 +155,7 @@ module SpiderGazelle
                     # If all the process connections are gone then we want to shutdown
                     # This should never happen under normal conditions
                     if @validated.length == 0
-                        Reactor.instance.shutdown
+                        Reactor.instance.shutdown unless @shutting_down
                     end
                 end
 
@@ -174,7 +175,7 @@ module SpiderGazelle
             #@logger.error "Master pipe went missing: #{reason}"
             # Server most likely exited
             # We'll shutdown here
-            STDERR.puts "\n\npanic! #{reason.inspect}\n\n\n"
+            STDERR.puts "\n\npanic! #{reason.inspect}\n#{caller.join("\n")}\n\n\n"
             STDERR.flush
             Reactor.instance.shutdown
         end

data/lib/spider-gazelle/spider.rb

@@ -101,7 +101,7 @@ module SpiderGazelle
         def shutdown(finished)
             @shutdown_defer = finished
 
-            @logger.verbose { "Spider Pid: #{Process.pid} shutting down" }
+            @logger.verbose { "Spider Pid: #{Process.pid} shutting down (loaded #{@loaded})" }
 
             if @loaded
                 perform_shutdown

data/lib/spider-gazelle/upgrades/websocket.rb

@@ -3,104 +3,95 @@
 require 'websocket/driver'
 require 'forwardable'
 
-module SpiderGazelle
-    class Websocket < ::Libuv::Q::DeferredPromise
-        attr_reader :env, :url, :reactor, :socket
+class SpiderGazelle::Websocket < ::Libuv::Q::DeferredPromise
+    attr_reader :env, :url, :reactor, :socket
 
+    extend ::Forwardable
+    def_delegators :@driver, :start, :ping, :protocol, :ready_state, :set_header, :state, :close
+    def_delegators :@socket, :write, :peername
 
-        RACK_URL_SCHEME = 'rack.url_scheme'
-        HTTP_HOST = 'HTTP_HOST'
-        REQUEST_URI= 'REQUEST_URI'
-        HTTPS = 'https'
+    def initialize(tcp, env)
+        @socket, @env = tcp, env
 
+        # Initialise the promise
+        super tcp.reactor, tcp.reactor.defer
 
-        extend Forwardable
-        def_delegators :@driver, :start, :ping, :protocol, :ready_state, :set_header, :state, :close
-        def_delegators :@socket, :write, :peername
+        scheme = env['rack.url_scheme'] == 'https' ? 'wss://' : 'ws://'
+        @url = scheme + env['HTTP_HOST'] + env['REQUEST_URI']
+        @driver = ::WebSocket::Driver.rack self
 
-        def initialize(tcp, env)
-            @socket, @env = tcp, env
+        # Pass data from the socket to the driver
+        @socket.progress &method(:socket_read)
+        @socket.finally &method(:socket_close)
 
-            # Initialise the promise
-            super tcp.reactor, tcp.reactor.defer
 
-            scheme = env[RACK_URL_SCHEME] == HTTPS ? 'wss://' : 'ws://'
-            @url = scheme + env[HTTP_HOST] + env[REQUEST_URI]
-            @driver = ::WebSocket::Driver.rack self
-
-            # Pass data from the socket to the driver
-            @socket.progress &method(:socket_read)
-            @socket.finally &method(:socket_close)
-
-
-            # Driver has indicated that it is closing
-            # We'll close the socket after writing any remaining data
-            @driver.on :close, &method(:on_close)
-            @driver.on :message, &method(:on_message)
-            @driver.on :error, &method(:on_error)
-        end
+        # Driver has indicated that it is closing
+        # We'll close the socket after writing any remaining data
+        @driver.on :close, &method(:on_close)
+        @driver.on :message, &method(:on_message)
+        @driver.on :error, &method(:on_error)
+    end
 
-        # Write some text to the websocket connection
-        #
-        # @param string [String] a string of data to be sent to the far end
-        def text(string)
-            @reactor.schedule { @driver.text(string.to_s) }
-        end
+    # Write some text to the websocket connection
+    #
+    # @param string [String] a string of data to be sent to the far end
+    def text(string)
+        @reactor.schedule { @driver.text(string.to_s) }
+    end
 
-        # Write some binary data to the websocket connection
-        #
-        # @param array [Array] an array of bytes to be sent to the far end
-        def binary(array)
-            @reactor.schedule { @driver.binary(array.to_a) }
-        end
+    # Write some binary data to the websocket connection
+    #
+    # @param array [Array] an array of bytes to be sent to the far end
+    def binary(array)
+        @reactor.schedule { @driver.binary(array.to_a) }
+    end
 
-        # Used to define a callback when data is received from the client
-        #
-        # @param callback [Proc] the callback to be called when data is received
-        def progress(callback = nil, &blk)
-            @progress = callback || blk
-        end
+    # Used to define a callback when data is received from the client
+    #
+    # @param callback [Proc] the callback to be called when data is received
+    def progress(callback = nil, &blk)
+        @progress = callback || blk
+    end
 
-        # Used to define a callback when the websocket connection is established
-        # Data sent before this callback is buffered.
-        #
-        # @param callback [Proc] the callback to be triggered on establishment
-        def on_open(callback = nil, &blk)
-            callback ||= blk
-            @driver.on :open, &callback
-        end
+    # Used to define a callback when the websocket connection is established
+    # Data sent before this callback is buffered.
+    #
+    # @param callback [Proc] the callback to be triggered on establishment
+    def on_open(callback = nil, &blk)
+        callback ||= blk
+        @driver.on :open, &callback
+    end
 
-        protected
+    protected
 
-        def socket_read(data, tcp)
-            begin
-                @driver.parse data
-            rescue => e
-                # Prevent hanging sockets
-                @socket.close
-                raise e
-            end
+    def socket_read(data, tcp)
+        begin
+            @driver.parse data
+        rescue => e
+            # Prevent hanging sockets
+            @socket.close
+            raise e
         end
+    end
 
-        def socket_close
-            if @shutdown_called.nil?
-                @defer.reject WebSocket::Driver::CloseEvent.new(1006, 'connection was closed unexpectedly')
-            end
+    def socket_close
+        if @shutdown_called.nil?
+            @defer.reject WebSocket::Driver::CloseEvent.new(1006, 'connection was closed unexpectedly')
         end
+    end
 
 
-        def on_message(event)
-            @progress.call(event.data, self) unless @progress.nil?
-        end
+    def on_message(event)
+        @progress.call(event.data, self) unless @progress.nil?
+    end
 
-        def on_error(event)
-            @defer.reject event
-        end
+    def on_error(event)
+        @defer.reject event
+    end
 
-        def on_close(event)
-            @shutdown_called = true
-            @socket.shutdown
-            @defer.resolve event
-        end
+    def on_close(event)
+        @shutdown_called = true
+        @socket.shutdown
+        @defer.resolve event
     end
 end

data/lib/spider-gazelle/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module SpiderGazelle
-    VERSION = '3.0.5'
+    VERSION = '3.0.6'
     EXEC_NAME = 'sg'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-parser
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A fast, parallel and concurrent web server for ruby