oop_rails_server 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5efc04e1524d7817cd6199a48cc343b9282a49d1
-  data.tar.gz: 57deb64381f3d70a18b9864b0ca40def8972ad59
+  metadata.gz: 64166a5f8c1b10c4954ae6fbee47d79fee0c1065
+  data.tar.gz: b9e67fb02b818e4d65a5189a91096d82f33733e9
 SHA512:
-  metadata.gz: 8c5f65df9dbc007b2431e4a5ac3175650ca46232baf93c33820f39e321e2ee268c6e08f62b0b9f77dde947d1768808cf13e9fcc46614fba08ef3ee24cf078ac8
-  data.tar.gz: 40ecaeba3c9683b7fc55f9b2bbbb4caa7efb1abda0bd273fa4bf22150c77390396e83e2b159488000a810ad04aa59217603e730161e6fda306d0932c9081e3b2
+  metadata.gz: 06e6d7d246ddb75ed3e6866505f34f2714c7ad8b94bb8d79899eb916c514dbd877bbd82b8fa8bc27959733e4abeed60edebb0ce19058a558350fbbb0a61bdaa1
+  data.tar.gz: c362495d9d4b97c349dd60d87c7953d55b61c8eff112f3166fd793a76067e77452e42d56a6b90d8cd95d86cf96916022e7f2649550ccb50859b5489a288a0e5d

data/CHANGES.md

@@ -1,5 +1,10 @@
 # `oop_rails_server` Releases
 
+## 0.0.12, 4 October 2015
+
+* Much better error output if the Rails server fails to start up, and willingness to keep trying if it returns an
+  error 500 instead of 200 -- occasionally this can happen immediately after startup, on some platforms.
+
 ## 0.0.11, 4 October 2015
 
 * Bump up the timeout we use for verifying that the server has started up properly. Travis CI with JRuby sometimes

data/lib/oop_rails_server/rails_server.rb

@@ -153,6 +153,23 @@ module OopRailsServer
       end
     end
 
+    def raise_startup_failed_error!(elapsed_time, exception)
+      last_lines = server_logfile = nil
+      if File.exist?(server_output_file) && File.readable?(server_output_file)
+        server_logfile = server_output_file
+        File::Tail::Logfile.open(server_output_file, :break_if_eof => true) do |f|
+          f.extend(File::Tail)
+          last_lines ||= [ ]
+          begin
+            f.tail(100) { |l| last_lines << l }
+          rescue File::Tail::BreakException
+            # ok
+          end
+        end
+      end
+
+      raise FailedStartupError.new(elapsed_time, exception, server_logfile, last_lines)
+    end
 
     def setup_directories!
       return if @directories_setup
@@ -268,7 +285,7 @@ EOS
 
     def start_server!
       output = server_output_file
-      cmd = "rails server -p #{port} > '#{output}' 2>&1"
+      cmd = "bundle exec rails server -p #{port} > '#{output}' 2>&1"
       safe_system(cmd, "starting 'rails server' on port #{port}", :background => true)
 
       server_pid_file = File.join(rails_root, 'tmp', 'pids', 'server.pid')
@@ -301,9 +318,9 @@ EOS
     end
 
     class FailedStartupError < StandardError
-      attr_reader :timeout, :verify_exception, :server_logfile, :last_lines
+      attr_reader :timeout, :verify_exception_or_message, :server_logfile, :last_lines
 
-      def initialize(timeout, verify_exception, server_logfile, last_lines)
+      def initialize(timeout, verify_exception_or_message, server_logfile, last_lines)
         message = %{The out-of-process Rails server failed to start up properly and start responding to requests,
 even after #{timeout.round} seconds. This typically means you've added code that prevents it from
 even starting up -- most likely, a syntax error in a class or other error that stops it
@@ -328,7 +345,7 @@ The last #{last_lines.length} lines of this log are:
         super(message)
 
         @timeout = timeout
-        @verify_exception = verify_exception
+        @verify_exception_or_message = verify_exception_or_message
         @server_logfile = server_logfile
         @last_lines = last_lines
       end
@@ -342,39 +359,28 @@ The last #{last_lines.length} lines of this log are:
 
       data = nil
       start_time = Time.now
-      while (! data)
+      last_exception = nil
+
+      while Time.now < (start_time + SERVER_VERIFY_TIMEOUT)
+        sleep 0.1
         begin
           data = Net::HTTP.get_response(uri)
         rescue Errno::ECONNREFUSED, EOFError => e
-          if Time.now > (start_time + SERVER_VERIFY_TIMEOUT)
-            last_lines = server_logfile = nil
-            if File.exist?(server_output_file) && File.readable?(server_output_file)
-              server_logfile = server_output_file
-              File::Tail::Logfile.open(server_output_file, :break_if_eof => true) do |f|
-                f.extend(File::Tail)
-                last_lines ||= [ ]
-                begin
-                  f.tail(100) { |l| last_lines << l }
-                rescue File::Tail::BreakException
-                  # ok
-                end
-              end
-            end
-
-            raise FailedStartupError.new(Time.now - start_time, e, server_logfile, last_lines)
-          end
-          # keep waiting
-          sleep 0.1
+          last_exception = e
         end
+
+        $stderr.puts "TRYING..."
+        break if data && data.code && data.code.to_s == '200'
       end
 
-      unless data.code.to_s == '200'
-        raise "'#{server_verify_url}' returned #{data.code.inspect}, not 200"
+      unless data && data.code && data.code.to_s == '200'
+        raise_startup_failed_error!(Time.now - start_time, last_exception || "'#{server_verify_url}' returned #{data.code.inspect}, not 200")
       end
+
       result = data.body.strip
 
       unless result =~ /^Rails\s+version\s*:\s*(\d+\.\d+\.\d+)\s*\n+\s*Ruby\s+version\s*:\s*(\d+\..*?)\s*\n+\s*Ruby\s+engine:\s*(.*?)\s*\n?$/mi
-        raise "'#{server_verify_url}' returned: #{result.inspect}"
+        raise_startup_failed_error!(Time.now - start_time, "'#{server_verify_url}' returned: #{result.inspect}")
       end
       actual_version = $1
       ruby_version = $2

data/lib/oop_rails_server/version.rb

@@ -1,3 +1,3 @@
 module OopRailsServer
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oop_rails_server
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Andrew Geweke