log all incoming rcmd regardless of outcome

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 7c1ed1a4e0d2a976015d465abfb465e2409357f2..78c5526b4ce4fd67f73d4d168a6f0c6bdb00b316 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1118,6 +1118,8 @@ sub load_hops
 sub process_rcmd
 {
        my ($self, $tonode, $fromnode, $user, $cmd) = @_;
+
+       Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd);
        if ($tonode eq $main::mycall) {
                my $ref = DXUser::get_current($fromnode);
                unless ($ref && UNIVERSAL::isa($ref, 'DXUser')) {
@@ -1131,7 +1133,6 @@ sub process_rcmd
                        $self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
                        return;
                }
-               Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd);
                if ($cmd !~ /^\s*rcmd/i && $ref->homenode && $cref->call eq $ref->homenode) { # not allowed to relay RCMDS!
                        if ($ref->{priv}) {             # you have to have SOME privilege, the commands have further filtering
                                $self->{remotecmd} = 1; # for the benefit of any command that needs to know
@@ -1216,6 +1217,9 @@ sub spawn_cmd
                
        my $fc = Mojo::IOLoop::Subprocess->new;
 
+       # just behave normally if something has set the "one-shot" _nospawn in the channel
+       return ($cmdref->(@$args)) if $self->{_nospawn};
+
        #       $fc->serializer(\&encode_json);
 #      $fc->deserializer(\&decode_json);
        $fc->run(