Skip to content
Snippets Groups Projects
Commit bc1d5e82 authored by Jan Soukal's avatar Jan Soukal
Browse files

doladeny chybove vypisy + uprava kodu.

parent 2df0608c
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/perl -w #!/usr/bin/perl -w
#
# WardenClientCommon.pm
#
# Copyright (C) 2011-2012 Cesnet z.s.p.o
#
# Use of this source is governed by a BSD-style license, see LICENSE file.
package WardenClientCommon; package WardenClientCommon;
...@@ -15,7 +21,7 @@ our $VERSION = "2.1"; ...@@ -15,7 +21,7 @@ our $VERSION = "2.1";
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
sub errMsg sub errMsg
{ {
my $msg = "Error message: " . shift; my $msg = shift;
if ($WardenClientConf::LOG_VERBOSE) { # user wants to log debug information if ($WardenClientConf::LOG_VERBOSE) { # user wants to log debug information
$msg .= "\nStack info: " . Carp::longmess(); $msg .= "\nStack info: " . Carp::longmess();
...@@ -40,7 +46,7 @@ sub c2s ...@@ -40,7 +46,7 @@ sub c2s
my $client; my $client;
my ($server, $port, $service) = $uri =~ /https:\/\/(.+)\:(\d+)\/(.+)/; my ($server, $port, $service) = $uri =~ /https:\/\/(.+)\:(\d+)\/(.+)/;
if (!($client = SOAP::Transport::HTTP::Client->new())) { if (!($client = SOAP::Transport::HTTP::Client->new())) {
errMsg("Sorry, unable to create socket: " . &SOAP::Transport::HTTP::Client::errstr) errMsg("Unable to create socket: " . &SOAP::Transport::HTTP::Client::errstr)
} }
$client->timeout(10); $client->timeout(10);
$client->ssl_opts(verify_hostname => 1, $client->ssl_opts(verify_hostname => 1,
...@@ -65,7 +71,7 @@ sub c2s ...@@ -65,7 +71,7 @@ sub c2s
# check server response # check server response
if (!defined $result) { if (!defined $result) {
errMsg("Error: server returned empty response." . "\n" . "Problem with used SSL ceritificates or Warden server at $server:$port is down."); errMsg("Server returned empty response. Problem with used SSL ceritificates or Warden server at $server:$port is down.");
} else { } else {
# deserialized response from server -> create SOAP envelope and data object # deserialized response from server -> create SOAP envelope and data object
my $response; my $response;
......
...@@ -119,12 +119,12 @@ sub getNewEvents ...@@ -119,12 +119,12 @@ sub getNewEvents
or do { or do {
if ($WardenClientConf::LOG_STDERR) { if ($WardenClientConf::LOG_STDERR) {
print STDERR "Warden-client unexpected end in eval block.\n" . $@ . "\n"; print STDERR $@ . "\n";
} }
if ($WardenClientConf::LOG_SYSLOG) { if ($WardenClientConf::LOG_SYSLOG) {
openlog("Warden:", "pid", "WardenClientConf::LOG_SYSLOG_FACILITY"); openlog("Warden:", "pid", "WardenClientConf::LOG_SYSLOG_FACILITY");
syslog("err|WardenClientConf::LOG_SYSLOG_FACILITY", "Warden-client unexpected end in eval block.\n" . $@ . "\n"); syslog("err|WardenClientConf::LOG_SYSLOG_FACILITY", $@ . "\n");
closelog(); closelog();
} }
return; return;
......
...@@ -73,12 +73,12 @@ sub saveNewEvent ...@@ -73,12 +73,12 @@ sub saveNewEvent
or do { or do {
if ($WardenClientConf::LOG_STDERR) { if ($WardenClientConf::LOG_STDERR) {
print STDERR "Warden-client unexpected end in eval block.\n" . $@ . "\n"; print STDERR $@ . "\n";
} }
if ($WardenClientConf::LOG_SYSLOG) { if ($WardenClientConf::LOG_SYSLOG) {
openlog("Warden-client:", "pid", "$WardenClientConf::LOG_SYSLOG_FACILITY"); openlog("Warden-client:", "pid", "$WardenClientConf::LOG_SYSLOG_FACILITY");
syslog("err|$WardenClientConf::LOG_SYSLOG_FACILITY", "Warden-client unexpected end in eval block.\n" . $@ . "\n"); syslog("err|$WardenClientConf::LOG_SYSLOG_FACILITY", $@ . "\n");
closelog(); closelog();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment