Small but important changes:

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy.pm

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 870f4dc..da29f02 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.74 2007-03-05 19:45:54 mike Exp $
+# $Id: IRSpy.pm,v 1.77 2007-03-15 11:36:58 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -234,7 +234,7 @@ sub _rewrite_record {
     # Since IRSpy can run for a long time between writes back to the
     # database, it's quite possible for the server to have closed the
     # connection as idle.  So re-establish it if necessary.
-    $conn->connect($conn->option("host"));
+    $this->{conn}->connect($conn->option("host"));
 
     _really_rewrite_record($this->{conn}, $rec);
     $conn->log("irspy", "rewrote XML record");
@@ -331,8 +331,10 @@ sub check {
                        $this->_rewrite_record($conn);
                        $conn->option(rewrote_record => 1);
                        if (@{ $this->{queue} } == 0) {
+                           # Do not destroy: we need this for later sanity checks
                            splice @conn, $i0, 1;
                        } else {
+                           $conn->destroy();
                            $conn[$i0] = create
                                ZOOM::IRSpy::Connection($this,
                                        shift @{ $this->{queue} }, async => 1);
@@ -467,9 +469,10 @@ sub check {
     }
 
     $this->log("irspy", "exiting main loop");
+
     # Sanity checks: none of the following should ever happen
     my $finished = 1;
-    @conn = @{ $this->{connections} };
+    $this->log("irspy", "performing end-of-run sanity-checks");
     foreach my $conn (@conn) {
        my $test = $conn->option("current_test_address");
        my $next = $this->_next_test($test);