testbot/TestAgent: Improve TestAgent's RPC diagnostic messages.

Francois Gouget fgouget at free.fr
Sun Mar 13 18:10:26 CDT 2016


If an error occurred while reconnecting for an RPC, the RPC name would not be mentioned in the error message.

Signed-off-by: Francois Gouget <fgouget at free.fr>
---
 testbot/lib/WineTestBot/TestAgent.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index 5d03a18..0e71831 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -860,7 +860,7 @@ sub _Connect($)
   my ($self) = @_;
 
   my $OldRPC = $self->{rpc};
-  $self->{rpc} = "Connect";
+  $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect";
 
   my $Step;
   foreach my $Dummy (1..$self->{cattempts})
@@ -966,7 +966,7 @@ sub _Connect($)
         if (!$self->{fd}->exec($self->{nc}))
         {
           alarm(0);
-          $self->_SetError($FATAL, "Unable to start netcat: " . $self->_ssherror());
+          $self->_SetError($FATAL, "Unable to start netcat ($self->{rpc}): " . $self->_ssherror());
           return; # out of eval
         }
       }
-- 
2.7.0




More information about the wine-patches mailing list