X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAGWMsg.pm;h=7582e2c723be8d45e0e3b0f23293e3d6f72174a3;hb=95345d68a5a8ac618021c0786c7234258b903f6e;hp=854050ae7761ed534784b9882c81bc82d3bec28a;hpb=f48da7dcd6d8305c018bebc6ffb5c11c3346aacf;p=spider.git

diff --git a/perl/AGWMsg.pm b/perl/AGWMsg.pm
index 854050ae..7582e2c7 100644
--- a/perl/AGWMsg.pm
+++ b/perl/AGWMsg.pm
@@ -51,7 +51,7 @@ sub init
 	
 	finish();
 	dbg('err', "AGW initialising and connecting to $addr/$port ...");
-	$sock = IO::Socket::INET->new(PeerAddr => $addr, PeerPort => $port, Proto=>'tcp', Timeout => 30);
+	$sock = IO::Socket::INET->new(PeerAddr => $addr, PeerPort => $port, Proto=>'tcp', Timeout=>15);
 	unless ($sock) {
 		dbg('err', "Cannot connect to AGW Engine at $addr/$port $!");
 		return;
@@ -76,11 +76,16 @@ sub init
 	_sendf('m') if $monitor;
 }
 
+my $finishing = 0;
+
 sub finish
 {
+	return if $finishing;
 	if ($sock) {
+		$finishing = 1;
 		dbg('err', "AGW ending...");
 		for (values %circuit) {
+			&{$_->{eproc}}() if $_->{eproc};
 			$_->disconnect;
 		}
 		# say we are going
@@ -201,7 +206,7 @@ sub _error
 	Msg::set_event_handler($sock, read=>undef, write=>undef, error=>undef);
 	$sock = undef;
 	for (%circuit) {
-		next unless $_->isa('AGWMsg');
+		&{$_->{eproc}}() if $_->{eproc};
 		$_->disconnect;
 	}
 }
@@ -315,7 +320,10 @@ sub _decode
 	} elsif ($sort eq 'd') {
 		dbg('agw', "AGW '$from'->'$to' port: $port Disconnected");
 		my $conn = _find($from eq $main::mycall ? $to : $from);
-		$conn->in_disconnect if $conn;
+		if ($conn) {
+			&{$conn->{eproc}}() if $conn->{eproc};
+			$conn->in_disconnect;
+		}
 	} elsif ($sort eq 'y') {
 		my ($frames) = unpack "V", $data;
 		dbg('agwpollans', "AGW Frames Outstanding on port $port = $frames");
@@ -387,7 +395,6 @@ sub in_disconnect
 {
 	my $conn = shift;
 	delete $circuit{$conn->{agwcall}}; 
-	_sendf('d', $conn->{agwcall}, $main::mycall, $conn->{agwport}, $conn->{agwpid});
 	$conn->SUPER::disconnect;
 }
 
@@ -410,6 +417,8 @@ sub enqueue
 		$msg =~ s/^[-\w]+\|//;
 #		_sendf('Y', $main::mycall, $conn->{call}, $conn->{agwport}, $conn->{agwpid});
 		_sendf('D', $main::mycall, $conn->{agwcall}, $conn->{agwport}, $conn->{agwpid}, $msg . $conn->{lineend});
+		my $len = length($msg) + 1; 
+		dbg('agw', "AGW Data Out port: $conn->{agwport} pid: $conn->{agwpid} '$main::mycall'->'$conn->{agwcall}' length: $len \"$msg\"");
 	}
 }