1 files changed, 109 insertions, 29 deletions
diff --git a/worker/tests/rsync.rb b/worker/tests/rsync.rb
index 2c781d8..e410454 100755
--- a/worker/tests/rsync.rb
+++ b/worker/tests/rsync.rb
@@ -1,48 +1,128 @@
+#!/usr/bin/ruby
+
+
+
+require 'socket'
 require 'timeout'
 
 
 #
-# Run an rsync test.
-#
-#
-# Return value
-#   TRUE:  The host is up
-#
-#  FALSE:  The host is not up
+# Test that we can receive a response from an rsync server that looks
+# reasonable.
 #
-def rsync_test ( params )
+class RSYNCTest
+
+  #
+  # Data passed from the JSON hash.
+  #
+  attr_reader :test_data
+
+  #
+  # The error text we return on failure.
+  #
+  attr_reader :error
 
+
+
+  #
+  # Save the data away.
+  #
+  def initialize( data )
+    @test_data = data
+  end
+
+
+  #
+  # Run the test.
+  #
+  #  Return "true" on success
   #
-  #  Get the hostname
+  #  Return "false" on failure.
   #
-  host = params['target_host']
-  port = 873
+  # If the test fails the details should be retrieved from "get_details".
+  #
+  def run_test
+    @error = ""
+
+    #
+    #  Get the hostname & port to test against.
+    #
+    host = @test_data['target_host']
+    port = 873
+
+    puts "rsync testing host #{host}:#{port}" if ( @test_data['verbose'] )
 
-  puts "rsync testing host #{host}:#{port}"
+    begin
+      timeout(3) do
 
+        begin
+          socket = TCPSocket.new( host, port )
+          socket.puts( "QUIT")
 
-  begin
-    timeout(3) do
+          banner = socket.gets(nil)
+          banner = banner[0,20]
 
-      begin
-        socket = TCPSocket.new( host, port )
-        socket.puts( "QUIT")
-        banner = socket.gets(nil)
-        socket.close()
+          socket.close()
 
-        banner = banner[0,20]
-        if ( banner =~ /rsyncd/i )
-          puts "rsync alive: #{banner}"
-          return true
+          if ( banner =~ /rsyncd/i )
+            puts "rsync alive: #{banner}" if ( @test_data['verbose'] )
+            return true
+          else
+            @error = "Banner didn't seem reasonable: #{banner}"
+            return false;
+          end
+        rescue
+          @error = "rsync exception on host #{host}:#{port} - #{$!}"
+          return false
         end
-      rescue
-        puts "Exception on host #{host}:#{port} - #{$!}"
-        return false
       end
+    rescue Timeout::Error => e
+      @error = "TIMEOUT: #{e}"
+      return false
     end
-  rescue Timeout::Error => e
-    puts "TIMEOUT: #{e}"
+
+    @error = "Misc failure"
     return false
   end
-  return false
+
+
+
+  #
+  #  Return the error text for why this test failed.
+  #
+  def get_details
+    return @error
+  end
+
 end
+
+
+#
+# Sample test, for testing.
+#
+if __FILE__ == $0 then
+
+  #
+  #  Sample data.
+  #
+  test = {
+    "target_host" => "upload.ns.bytemark.co.uk",
+    "test_type"   => "rsync",
+    "verbose"     => 1,
+    "test_alert"  => "DNS upload service failure",
+  }
+
+
+  #
+  #  Run the test.
+  #
+  obj = RSYNCTest.new( test )
+  if ( obj.run_test )
+    puts "TEST OK"
+  else
+    puts "TEST FAILED"
+    puts obj.get_details()
+  end
+
+end
+