This commit was generated by cvs2svn to compensate for changes in r372,

which included commits to RCS files with non-trunk default branches.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 20 insertions, 13 deletions

diff --git a/lib/ping.rb b/lib/ping.rb
index d742a50f9..065b1d230 100644
--- a/lib/ping.rb
+++ b/lib/ping.rb
@@ -26,6 +26,10 @@
 #
 #    The timeout in seconds. If not specified it will default to 5 seconds.
 #
+#  : service
+#
+#    The service port to connect.  The default is "echo".
+#
 #= WARNING
 #
 # pingecho() uses user-level thread to implement the timeout, so it may block
@@ -33,23 +37,26 @@
 #
 #=end
 
+require 'timeout'
+
 module Ping
   require "socket"
-  def pingecho(host, timeout=5)
+  def pingecho(host, timeout=5, service="echo")
     begin
-      x = Thread.current
-      y = Thread.start {
-	sleep timeout
-	x.raise RuntimeError if x.status
-      }
-      s = TCPsocket.new(host, "echo")
-      s.close
-      return TRUE
+      timeout(timeout) do
+	s = TCPsocket.new(host, service)
+	s.close
+      end
     rescue
-      return FALSE;
-    ensure
-      Thread.kill y if y.status
+      return false
     end
+    return true
   end
-  module_function "pingecho"
+  module_function :pingecho
+end
+
+if $0 == __FILE__
+  host = ARGV[0]
+  host ||= "localhost"
+  printf("%s alive? - %s\n", host,  Ping::pingecho(host, 5))
 end