doladeny chybove vypisy + uprava kodu.

src/warden-client/lib/WardenClientCommon.pm

 #!/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;
 
@@ -15,7 +21,7 @@ our $VERSION = "2.1";
 #-------------------------------------------------------------------------------
 sub errMsg
 {
-  my $msg = "Error message: " . shift;
+  my $msg = shift;
 
   if ($WardenClientConf::LOG_VERBOSE) { # user wants to log debug information
     $msg .= "\nStack info: " . Carp::longmess();
@@ -40,7 +46,7 @@ sub c2s
   my $client;
   my ($server, $port, $service) = $uri =~ /https:\/\/(.+)\:(\d+)\/(.+)/;
   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->ssl_opts(verify_hostname     => 1,
@@ -65,7 +71,7 @@ sub c2s
 
   # check server response
   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 {
     # deserialized response from server -> create SOAP envelope and data object
     my $response;

src/warden-client/lib/WardenClientReceive.pm

@@ -119,12 +119,12 @@ sub getNewEvents
   or do {
   
    if ($WardenClientConf::LOG_STDERR) {
-      print STDERR "Warden-client unexpected end in eval block.\n" . $@ . "\n";
+      print STDERR $@ . "\n";
     }
     
     if ($WardenClientConf::LOG_SYSLOG) {
       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();
     }
     return;

src/warden-client/lib/WardenClientSend.pm

@@ -38,33 +38,33 @@ sub saveNewEvent
     WardenClientConf::loadConf($conf_file);
 
     # prepare variables of event 
-    my @event         = @{$event_ref};
-    my $service		    = $event[0];
-    my $detected		  = $event[1];
-    my $type		      = $event[2];
-    my $source_type	  = $event[3];
-    my $source		    = $event[4];
-    my $target_proto	= $event[5];
-    my $target_port	  = $event[6];
-    my $attack_scale	= $event[7];
-    my $note		      = $event[8];
-    my $priority		  = $event[9];
-    my $timeout		    = $event[10];
+    my @event        = @{$event_ref};
+    my $service      = $event[0];
+    my $detected     = $event[1];
+    my $type         = $event[2];
+    my $source_type  = $event[3];
+    my $source       = $event[4];
+    my $target_proto = $event[5];
+    my $target_port  = $event[6];
+    my $attack_scale = $event[7];
+    my $note         = $event[8];
+    my $priority     = $event[9];
+    my $timeout      = $event[10];
 
     # create SOAP data object
     my $event = SOAP::Data->name(
       event => \SOAP::Data->value(
-        SOAP::Data->name(SERVICE		  => $service),
-        SOAP::Data->name(DETECTED		  => $detected),
-        SOAP::Data->name(TYPE	    	  => $type),
+        SOAP::Data->name(SERVICE      => $service),
+        SOAP::Data->name(DETECTED     => $detected),
+        SOAP::Data->name(TYPE         => $type),
         SOAP::Data->name(SOURCE_TYPE  => $source_type),
-        SOAP::Data->name(SOURCE		    => $source),
-        SOAP::Data->name(TARGET_PROTO	=> $target_proto),
-        SOAP::Data->name(TARGET_PORT	=> $target_port),
-        SOAP::Data->name(ATTACK_SCALE	=> $attack_scale),
-        SOAP::Data->name(NOTE		      => $note),
+        SOAP::Data->name(SOURCE       => $source),
+        SOAP::Data->name(TARGET_PROTO => $target_proto),
+        SOAP::Data->name(TARGET_PORT  => $target_port),
+        SOAP::Data->name(ATTACK_SCALE => $attack_scale),
+        SOAP::Data->name(NOTE         => $note),
         SOAP::Data->name(PRIORITY     => $priority),
-        SOAP::Data->name(TIMEOUT		  => $timeout)
+        SOAP::Data->name(TIMEOUT      => $timeout)
       )
     );
 
@@ -73,12 +73,12 @@ sub saveNewEvent
   or do { 
     
     if ($WardenClientConf::LOG_STDERR) {
-      print STDERR "Warden-client unexpected end in eval block.\n" . $@ . "\n";
+      print STDERR $@ . "\n";
     }
 
     if ($WardenClientConf::LOG_SYSLOG) {
       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();
     }