X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Flog.pl;h=5a83d4435ac723808880d118d1fe9faef72b6bb2;hb=0ce79a125db0acb043fceaa641d8b3a9eae71a41;hp=3ff4a50b25dfab2f55027caff8ebe7aba5bec1db;hpb=0ba8b8bf6f01f405661aef65a070a8557e98dd3b;p=spider.git diff --git a/cmd/show/log.pl b/cmd/show/log.pl index 3ff4a50b..5a83d443 100644 --- a/cmd/show/log.pl +++ b/cmd/show/log.pl @@ -5,38 +5,52 @@ # # # -my $self = shift; -my $cmdline = shift; -my @f = split /\s+/, $cmdline; -my $f; -my @out; -my ($from, $to, $who, $hint); +sub handle +{ + my $self = shift; -$from = 0; -while ($f = shift @f) { # next field - # print "f: $f list: ", join(',', @list), "\n"; - unless ($from || $to) { - ($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # is it a from -> to count? - next if $from && $to > $from; + my $cmdline = shift; + my @f = split /\s+/, $cmdline; + my $f; + my @out; + my ($from, $to, $who, $hint); + + $from = 0; + while ($f = shift @f) { # next field + # print "f: $f list: ", join(',', @list), "\n"; + unless ($from || $to) { + ($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # is it a from -> to count? + next if $from && $to > $from; + } + unless ($to) { + ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count? + next if $to; + } + unless ($who) { + $who = $f; + next if $who; + } } - unless ($to) { - ($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count? - next if $to; - } - unless ($who) { - $who = $f; - next if $who; - } -} -$to = 20 unless $to; -$from = 0 unless $from; + $to = 20 unless $to; + $from = 0 unless $from; + + if ($self->priv < 6) { + return (1, $self->msg('e5')) if defined $who && $who ne $self->call; + $who = $self->call; + } -if ($self->priv < 6) { - return (1, $self->msg('e5')) if defined $who && $who ne $self->call; - $who = $self->call; + @out = $self->spawn_cmd(\&DXLog::print, args => [$from, $to, $main::systime, undef, $who]); + +# my $fc = Mojo::IOLoop::ForkCall->new; +# $fc->run( +# sub {my @args = @_; my @res = DXLog::print(@args); return @res}, +# [$from, $to, $main::systime, undef, $who], +# sub {my ($fc, $err, @out) = @_; delete $self->{stash}; $self->send(@out);} +# ); +# #$self->{stash} = $fc; + +# @out = DXLog::print($from, $to, $main::systime, undef, $who); + return (1, @out); } - -@out = DXLog::print($from, $to, $main::systime, undef, $who); -return (1, @out);