X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=e247d3c96791ebde87b35945124e89455f6fb9d2;hb=a46e7e063c95e0dc3a470f91568cedb58290769c;hp=4d7040cf2374f9c97b58b76dd9484be131afbd9d;hpb=1f2757c4c57b6b4492923ed4edd7f0f912a31157;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index 4d7040cf..e247d3c9 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -26,6 +26,7 @@ BEGIN {
 }
 
 use Msg;
+use IntMsg;
 use DXVars;
 use DXDebug;
 use DXUtil;
@@ -103,9 +104,7 @@ sub do_resize
 sub cease
 {
 	my $sendz = shift;
-#	if ($conn && $sendz) {
-#		$conn->send_now("Z$call|bye...");
-#	}
+	$conn->disconnect if $conn;
 	endwin();
 	dbgclose();
 	print @_ if @_;
@@ -422,7 +421,7 @@ if ($call eq $mycall) {
 	exit(0);
 }
 
-$conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket);
+$conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket);
 if (! $conn) {
 	if (-r "$data/offline") {
 		open IN, "$data/offline" or die;
@@ -436,9 +435,14 @@ if (! $conn) {
 	exit(0);
 }
 
+$conn->set_error(sub{cease(0)});
+
+
+unless ($DB::VERSION) {
+	$SIG{'INT'} = \&sig_term;
+	$SIG{'TERM'} = \&sig_term;
+}
 
-$SIG{'INT'} = \&sig_term;
-$SIG{'TERM'} = \&sig_term;
 #$SIG{'WINCH'} = \&do_resize;
 $SIG{'HUP'} = \&sig_term;
 
@@ -455,7 +459,7 @@ Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
 my $lastmin = 0;
 for (;;) {
 	my $t;
-	Msg->event_loop(1, 1);
+	Msg->event_loop(10, 0.01);
 	$t = time;
 	if ($t > $lasttime) {
 		my ($min)= (gmtime($t))[1];