Remove wait on drain (which may never happen)

[spider.git] / cmd / bye.pl

diff --git a/cmd/bye.pl b/cmd/bye.pl
index 9288d44264402db471db2c00af3d55c6841c0498..c974799ea9d1034ef41863de6f2cde27cda42ced 100644 (file)
--- a/cmd/bye.pl
+++ b/cmd/bye.pl
@@ -6,15 +6,16 @@
 
 
 my $self = shift;
-return (1, $self->msg('e5')) if $self->inscript;
+return (1, $self->msg('e5')) if $self->inscript || $self->remotecmd;
 
 my $fn = localdata("logout");
 dbg("fn: $fn " . (-e $fn ? 'exists' : 'missing'));
 
 if ($self->is_user && -e $fn) {
        $self->send_file($fn);
+       Mojo::IOLoop->timer($Msg::disc_waittime, sub{$self->disconnect});
+} else {
+       $self->disconnect;
 }
 
-$self->disconnect;
-
 return (1);