doplnena identifikace warden serveru v error hlaskach

src/warden-server/lib/Warden.pm

@@ -155,7 +155,7 @@ sub authorizeClient
   if ($sth->rows == 0) {
     sendMsg("err",
            "Unauthorized access to function '$function_name' from: '$ip'; CN(AN): $alt_names; used service: '$service_type' - client is not registered",
-           "Access denied - client is not registered at warden server");
+           "Access denied - client is not registered at warden server $ENV{'SERVER_NAME'}");
     return undef;
   }
 
@@ -163,7 +163,7 @@ sub authorizeClient
   if (!$correct_ip_source) {
     sendMsg ("err",
             "Unauthorized access to function '$function_name' from: '$ip'; CN(AN): $alt_names; used service: '$service_type' - access from bad subnet: Registered subnet '$ret{'cidr'}'",
-            "Access denied - access from unauthorized subnet");
+            "Access denied - access to $ENV{'SERVER_NAME'} from unauthorized subnet");
     return undef;
   }
 
@@ -447,7 +447,7 @@ sub registerSender
     if (defined $result) {
       sendMsg("err",
              "Attempt to re-register the sender: {hostname: '$hostname', service: '$service', cidr: '$ip_net_client'}",
-             "Sender has been already registered at '$result'");
+             "Sender has been already registered at $ENV{'SERVER_NAME'} in '$result'");
     } else {
       $sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);");
       if (!defined $sth) {
@@ -457,7 +457,7 @@ sub registerSender
       }
       $sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
         sendMsg("info",
-	       "New sender '$hostname' {service: '$service', cidr: '$ip_net_client'} was registered",
+	       "New sender '$hostname' {service: '$service', cidr: '$ip_net_client'} was registered at $ENV{'SERVER_NAME'}",
 	        undef);
       return 1;
     }
@@ -512,7 +512,7 @@ sub registerReceiver
     if (defined $result) {
       sendMsg("err",
              "Attempt to re-register the receiver: {hostname: '$hostname', type: '$type', cidr: '$ip_net_client'}",
-             "Receiver has already been registered at '$result'");
+             "Receiver has already been registered at $ENV{'SERVER_NAME'} in '$result'");
     } else {
       $sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);");
       if (!defined($sth)) {
@@ -522,7 +522,7 @@ sub registerReceiver
       }
       $sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
       sendMsg("info",
-             "New receiver '$hostname' {type: '$type', cidr: '$ip_net_client'} was registered",
+             "New receiver '$hostname' {type: '$type', cidr: '$ip_net_client'} was registered at $ENV{'SERVER_NAME'}",
 	      undef);
       return 1;
     }
@@ -567,7 +567,7 @@ sub unregisterClient
     if (!defined $id) {
       sendMsg("err",
              "Attempt to delete unregister client '$id', '$hostname', '$service', '$client_type'",
-             "Client (#$client_id) is not registered");
+             "Client (#$client_id) is not registered at $ENV{'SERVER_NAME'}");
     } else {
       if ($client_type eq 's') {
         $sth = $DBH->prepare("DELETE FROM clients WHERE client_id = ?;");
@@ -598,7 +598,7 @@ sub unregisterClient
 	}
 	$sth->execute($client_id);
         sendMsg("info",
-	       "Receiver '$hostname' (client_id: '$client_id') was deleted",
+	       "Receiver '$hostname' (client_id: '$client_id') was deleted from $ENV{'SERVER_NAME'}",
 	        undef);
         return 1;
       }
@@ -664,7 +664,7 @@ sub getClients
     }
     my $sum = scalar @clients;
     sendMsg("info",
-           "Sending information about '$sum' registered clients",
+           "Sending information about '$sum' registered clients from $ENV{'SERVER_NAME'}",
 	    undef);
     return @clients;
   }
@@ -810,7 +810,7 @@ sub getStatus
       }
     }
     sendMsg("info",
-           "Sent warden server status info",
+           "Sent warden server status info from $ENV{'SERVER_NAME'}",
 	    undef);
     return @status;
   }