diff --git a/src/warden-client/lib/WardenClientCommon.pm b/src/warden-client/lib/WardenClientCommon.pm index 112896041b9158d61b4046baeb9675e4726e31bb..03775b6df7c6213ce693420192b186e90f2008d7 100755 --- a/src/warden-client/lib/WardenClientCommon.pm +++ b/src/warden-client/lib/WardenClientCommon.pm @@ -25,9 +25,9 @@ our $VERSION = "2.2"; sub errMsg { my $msg = shift; - my $type = shift; + my $type = shift; defined $type or $type = "err"; # default type is err. Other: warn - + # check verbose logging if (($type eq "err") && ($WardenClientCommon::LOG_VERBOSE)) { $msg .= "\nStack info: " . Carp::longmess(); @@ -69,7 +69,7 @@ sub c2s eval { $client = SOAP::Transport::HTTP::Client->new(); } or return errMsg("Error in function 'c2s()' when creating SOAP::Transport::HTTP::Client object: " . $@); - + # setting of connection timeout eval {$client->timeout($WardenClientCommon::CONNECTION_TIMEOUT);} or return errMsg("Error in function 'c2s()' when setting connection timeout: " . $@); @@ -90,7 +90,7 @@ sub c2s eval { $soap = SOAP::Lite->uri($service)->proxy($WardenClientCommon::URI); } or return errMsg("Error in function 'c2s()' when setting service URI: " . $@); - + # serialize SOAP envelope or SOAP envelope and data object my $envelope; if (!defined $data) { @@ -118,9 +118,9 @@ sub c2s my $response; eval { $response = $soap->deserializer->deserialize($result); - } or return errMsg("Error in deserialization of server response: " . $@ . " (Received response: " . $result . ")"); + } or return errMsg("Error in deserialization of server response:" . $@ . "\nReceived response: " . $result); # check SOAP fault status - $response->fault ? return errMsg("Server sent error message:: " . $response->faultstring) : return $response; + $response->fault ? return errMsg("Server sent error message: " . $response->faultstring) : return $response; } }