rtext 0.5.0 → 0.5.1

data/CHANGELOG

@@ -43,3 +43,7 @@
 * Fixed backward reference list to not include opposites of forward references
 * Fixed problem with backend service socket connection on some machines
 
+=0.5.1
+
+* Fixed service connection problem when ports are in use by other processes
+

data/Rakefile

@@ -8,7 +8,7 @@ DocFiles = [
 
 RTextGemSpec = Gem::Specification.new do |s|
   s.name = %q{rtext}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = %q{Ruby Textual Modelling}
   s.email = %q{martin dot thiede at gmx de}

data/lib/rtext/service.rb

@@ -229,18 +229,8 @@ class Service
     port = PortRangeStart
     serv = nil
     begin
-      serv = TCPServer.new("localhost", port)
-      if serv.addr[0] == "AF_INET6"
-        # we need to make sure that two RText server won't connect on the same port but with IPv4 and IPv6
-        # therefore we always use the IPv4 interface, try again to get the IPv4 interface
-        # note that using "127.0.0.1" instead of localhost would always get us the IPv4 interface on the 
-        # first try, however, on some machines using the IP address instead of localhost doesn't work
-        # (EACCES error was seen, possibly due to some specific firewall setup)
-        serv2 = TCPServer.new("localhost", port)
-        serv.close
-        serv = serv2
-      end
-    rescue Errno::EADDRINUSE, Errno::EAFNOSUPPORT
+      serv = TCPServer.new("127.0.0.1", port)
+    rescue Errno::EADDRINUSE, Errno::EAFNOSUPPORT, Errno::EACCES
       port += 1
       retry if port <= PortRangeEnd
       raise

data/test/integration/backend.out

@@ -1,10 +1,10 @@
-RText service, listening on port 9001
-[09:46:38] INFO accepted connection
-[09:46:38] DEBUG request: {"command"=>"load_model", "invocation_id"=>1, "type"=>"request"}
-[09:46:38] DEBUG response: {"type"=>"response", "invocation_id"=>1, "problems"=>[], "total_problems"=>0}
-[09:46:38] DEBUG request: {"command"=>"unknown", "invocation_id"=>2, "type"=>"request"}
-[09:46:38] WARN unknown command unknown
-[09:46:38] DEBUG response: {"type"=>"unknown_command_error", "invocation_id"=>2, "command"=>"unknown"}
-[09:46:38] DEBUG request: {"type"=>"request", "command"=>"stop", "invocation_id"=>3}
-[09:46:38] INFO RText service, stopping now (stop requested)
-[09:46:38] DEBUG response: {"type"=>"response", "invocation_id"=>3}
+RText service, listening on port 9002
+[11:19:15] INFO accepted connection
+[11:19:15] DEBUG request: {"command"=>"load_model", "invocation_id"=>1, "type"=>"request"}
+[11:19:15] DEBUG response: {"type"=>"response", "invocation_id"=>1, "problems"=>[], "total_problems"=>0}
+[11:19:15] DEBUG request: {"command"=>"unknown", "invocation_id"=>2, "type"=>"request"}
+[11:19:15] WARN unknown command unknown
+[11:19:15] DEBUG response: {"type"=>"unknown_command_error", "invocation_id"=>2, "command"=>"unknown"}
+[11:19:15] DEBUG request: {"type"=>"request", "command"=>"stop", "invocation_id"=>3}
+[11:19:15] INFO RText service, stopping now (stop requested)
+[11:19:15] DEBUG response: {"type"=>"response", "invocation_id"=>3}

data/test/integration/frontend.log

@@ -25136,3 +25136,73 @@ I, [2012-12-03T09:46:38.205525 #56604]  INFO -- : ruby -I../../../../rgen/lib -I
 
 I, [2012-12-03T09:46:38.631549 #56604]  INFO -- : connecting to 9001
 I, [2012-12-03T09:46:39.936624 #56604]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:18:31.507696 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../crash_on_request_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:18:32.042726 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:18:32.245738 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:18:37.151019 #58688]  INFO -- : ruby -e "sleep(2)"
+
+W, [2012-12-07T11:18:39.382146 #58688]  WARN -- : could not connect socket (connection timeout)
+I, [2012-12-07T11:18:39.382146 #58688]  INFO -- : ruby -e "sleep(2)"
+
+W, [2012-12-07T11:18:41.495267 #58688]  WARN -- : could not connect socket (connection timeout)
+I, [2012-12-07T11:18:41.597273 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:18:41.907291 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:18:44.455436 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:18:44.560442 #58688]  INFO -- : ruby -e "this will crash"
+
+W, [2012-12-07T11:18:45.589501 #58688]  WARN -- : could not connect socket (connection timeout)
+I, [2012-12-07T11:18:45.590501 #58688]  INFO -- : ruby -e "this will crash"
+
+W, [2012-12-07T11:18:46.617560 #58688]  WARN -- : could not connect socket (connection timeout)
+I, [2012-12-07T11:18:46.722566 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:18:47.148590 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:18:48.756682 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:18:48.761683 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:18:49.255711 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:18:50.673792 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:18:50.679792 #58688]  INFO -- : invalid_command_will_fail
+
+W, [2012-12-07T11:18:51.714852 #58688]  WARN -- : could not connect socket (connection timeout)
+I, [2012-12-07T11:18:51.715852 #58688]  INFO -- : invalid_command_will_fail
+
+W, [2012-12-07T11:18:52.741910 #58688]  WARN -- : could not connect socket (connection timeout)
+I, [2012-12-07T11:18:52.846916 #58688]  INFO -- : ruby -E utf-8 -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.invenc" 2>&1
+
+I, [2012-12-07T11:18:53.311943 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:18:54.619018 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:18:54.621018 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:18:54.931036 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:18:56.954151 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:18:56.959152 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:18:57.394176 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:18:58.709252 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:18:58.714252 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:18:59.091274 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:19:00.296342 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:19:00.301343 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect3" 2>&1
+
+I, [2012-12-07T11:19:00.729367 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:19:07.153735 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:19:07.160735 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:19:07.629762 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:19:10.579931 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:19:10.592931 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:19:10.916950 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:19:12.532042 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:19:12.538043 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:19:12.964067 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:19:14.580159 #58688]  INFO -- : server socket closed (end of file)
+I, [2012-12-07T11:19:14.585160 #58688]  INFO -- : ruby -I../../../../rgen/lib -I ../../../lib ../ecore_editor.rb "*.ect" 2>&1
+
+I, [2012-12-07T11:19:15.012184 #58688]  INFO -- : connecting to 9002
+I, [2012-12-07T11:19:16.318259 #58688]  INFO -- : server socket closed (end of file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtext
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen