Remove wait on drain (which may never happen)

[spider.git] / cmd / bye.pl

diff --git a/cmd/bye.pl b/cmd/bye.pl
index 653e939407a4067141f4da5bad97e11074af859a..c974799ea9d1034ef41863de6f2cde27cda42ced 100644 (file)
--- a/cmd/bye.pl
+++ b/cmd/bye.pl
@@ -1,22 +1,21 @@
 #
 # the bye command
 #
-# $Id$
+#
 #
 
-my $self = shift;
 
-# log out text
-if ($self->is_user && -e "$main::data/logout") {
-       open(I, "$main::data/logout") or confess;
-       my @in = <I>;
-       close(I);
-       $self->send_now('D', @in);
-       sleep(1);
-}
+my $self = shift;
+return (1, $self->msg('e5')) if $self->inscript || $self->remotecmd;
 
-#$self->send_now('Z', "");
+my $fn = localdata("logout");
+dbg("fn: $fn " . (-e $fn ? 'exists' : 'missing'));
 
-$self->disconnect;
+if ($self->is_user && -e $fn) {
+       $self->send_file($fn);
+       Mojo::IOLoop->timer($Msg::disc_waittime, sub{$self->disconnect});
+} else {
+       $self->disconnect;
+}
 
 return (1);