changes to perl/Messages from ea1dav

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index e062b65ed7c7184808042c4d51c23018af931901..06dab32b2456a291d0b558e0b8006ec08c043704 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -102,7 +102,7 @@ sub error_handler
 {
        my $dxchan = shift;
        $dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
-       $dxchan->disconnect;
+       $dxchan->disconnect(1);
 }
 
 # handle incoming messages
@@ -115,7 +115,8 @@ sub new_channel
        # set up the basic channel info
        # is there one already connected to me - locally? 
        my $user = DXUser->get($call);
-       if ($sort ne 'O' && Msg->conns($call)) {
+       my $dxchan = DXChannel->get($call);
+       if ($dxchan) {
                my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
                already_conn($conn, $call, $mess);
                return;
@@ -150,7 +151,6 @@ sub new_channel
        }
 
        # create the channel
-       my $dxchan;
        $dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
        $dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
        $dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
@@ -421,7 +421,7 @@ dbg('err', "orft we jolly well go ...");
 for (;;) {
 #      $DB::trace = 1;
        
-       Msg->event_loop(10, 0.001);
+       Msg->event_loop(10, 0.010);
        my $timenow = time;
        process_inqueue();                      # read in lines from the input queue and despatch them
 #      $DB::trace = 0;