From 84e00cbba51d8a76d27294ffd49d586eb27d1d35 Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Thu, 9 Aug 2018 06:52:31 +0000
Subject: [PATCH] 93_Log2Syslog: V4.6.0

git-svn-id: https://svn.fhem.de/fhem/trunk@17109 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/93_Log2Syslog.pm | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/fhem/contrib/93_Log2Syslog.pm b/fhem/contrib/93_Log2Syslog.pm
index 736f73571..fc1407c2d 100644
--- a/fhem/contrib/93_Log2Syslog.pm
+++ b/fhem/contrib/93_Log2Syslog.pm
@@ -436,18 +436,12 @@ sub Log2Syslog_parsePayload($$) {
   my $severity     = "";
   my $facility     = "";  
   my @evf          = split(",",AttrVal($name, "outputFields", "FAC,SEV,ID,CONT"));   # auszugebene Felder im Event/Reading
-  my ($delimiter,$day,$ietf,$err,$pl,$tail,$tail2);
-  my $Mmm = "";
-  my $dd  = "";
+  my ($Mmm,$dd,$delimiter,$day,$ietf,$err,$pl,$tail);
   
   # Hash zur Umwandlung Felder in deren Variablen
-  my ($prival,$date,$pid,$mid,$sdfield,$cont);
-  my $fac  = "";
-  my $sev  = "";
-  my $host = "";
-  my $ts   = "";
-  my $id   = "";
-  my $time = "";
+  my ($prival,$ts,$host,$date,$time,$id,$pid,$mid,$sdfield,$cont);
+  my $fac = "";
+  my $sev = "";
   my %fh = (PRIVAL  => \$prival,
             FAC     => \$fac,
             SEV     => \$sev,
@@ -523,7 +517,7 @@ sub Log2Syslog_parsePayload($$) {
               Log2Syslog_Log3slog ($hash, 1, "Log2Syslog $name - error parse msg -> $data");          
           }
      
-          Log2Syslog_Log3slog($name, 4, "$name - parsed message -> FAC: $fac, SEV: $sev, MM: ".$Mmm?$Mmm:"".", Day: ".$dd?$dd:"".", TIME: ".$time?$time:"".", TS: $ts, HOST: $host, ID: $id, CONT: $cont");
+          Log2Syslog_Log3slog($name, 4, "$name - parsed message -> FAC: $fac, SEV: $sev, MM: $Mmm, Day: $dd, TIME: $time, TS: $ts, HOST: $host, ID: $id, CONT: $cont");
           $host = "" if($host eq "-");
 		  $phost = $host?$host:$phost;
           
@@ -1411,13 +1405,12 @@ sub Log2Syslog_evalPeer($) {
   my ($hash) = @_;
   my $name   = $hash->{NAME};
   my $socket = $hash->{SERVERSOCKET};
-  my $phost  = "";
-  my $paddr  = "";
+  my ($phost,$paddr);
   
   my($pport, $pipaddr) = sockaddr_in($socket->peername);
   $phost = gethostbyaddr($pipaddr, AF_INET);
   $paddr = inet_ntoa($pipaddr);
-  Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name - message peerhost: ".$phost?$phost:"".", ".$paddr);
+  Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name - message peerhost: $phost,$paddr");
 
 return ($phost,$paddr); 
 }