FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

93_Log2Syslog: contrib 5.9.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21581 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-04-02 13:02:28 +00:00
parent 7d1819efc3
commit 17a525466c
1 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fhem/contrib/DS_Starter/93_Log2Syslog.pm
View File

@ -93,10 +93,10 @@ our %Log2Syslog_vNotesIntern = (
"2.4.1" => "21.08.2017 changes in Log2Syslog_charfilter, change PROCID to \$hash->{SEQNO} ".
"switch to non-blocking in subs event/Log2Syslog_fhemlog",
"2.4.0" => "20.08.2017 new sub Log2Syslog_Log3slog for entries in local fhemlog only -> verbose support",
"2.3.1" => "19.08.2017 commandref revised",
"2.3.1" => "19.08.2017 commandref revised ",
"2.3.0" => "18.08.2017 new parameter 'ident' in DEF, sub setidex, Log2Syslog_charfilter",
"2.2.0" => "17.08.2017 set BSD data length, set only acceptable characters (USASCII) in payload,
commandref revised",
"2.2.0" => "17.08.2017 set BSD data length, set only acceptable characters (USASCII) in payload ".
"commandref revised ",
"2.1.0" => "17.08.2017 sub Log2Syslog_opensock created",
"2.0.0" => "16.08.2017 create syslog without SYS::SYSLOG",
"1.1.1" => "13.08.2017 registrate Log2Syslog_fhemlog to %loginform in case of sending fhem-log ".
@ -1089,7 +1089,7 @@ sub Log2Syslog_parsePayload {
Log2Syslog_Log3slog ($hash, 1, "Log2Syslog $name - no parseFn defined.");
}
} elsif ($pp eq "unknown") {
} elsif ($pp eq "unknown") {
$err = 1;
Log2Syslog_Log3slog ($hash, 1, "Log2Syslog $name - Message format could not be detected automatically. PLease check and set attribute \"parseProfile\" manually.");
}
@ -1223,7 +1223,7 @@ sub Log2Syslog_Set {
$hash->{HELPER}{MEMLOCK} = 1;
InternalTimer(gettimeofday()+2, "Log2Syslog_deleteMemLock", $hash, 0);
Log2Syslog_closesock ($hash,1); # Clientsocket schließen
Log2Syslog_closesock ($hash,1); # Clientsocket schließen
Log2Syslog_downServer($hash,1); # Serversocket schließen
if($hash->{MODEL} =~ /Collector/) { # Serversocket öffnen
InternalTimer(gettimeofday()+0.5, "Log2Syslog_initServer", "$name,global", 0);
@ -1649,9 +1649,9 @@ sub Log2Syslog_fhemlog {
if($ret && $ret > 0) {
Log2Syslog_Log3slog($name, 4, "Log2Syslog $name - Payload sequence $pid sent\n");
} else {
my $err = $!;
$err = $!;
$st = "write error: $err";
Log2Syslog_Log3slog($name, 3, "Log2Syslog $name - Warning - Payload sequence $pid NOT sent: $err\n");
$st = "write error: $err";
}
my $uef = AttrVal($name, "useEOF", 0);
@ -1692,7 +1692,7 @@ sub Log2Syslog_sendTestMsg {
$prival = "14";
($data,$pid) = Log2Syslog_setpayload($hash,$prival,$date,$time,$otp,"fhem");
return if(!$data);
return if(!$data);
}
($sock,$st) = Log2Syslog_opensock($hash,0);
@ -1703,9 +1703,9 @@ sub Log2Syslog_sendTestMsg {
Log2Syslog_Log3slog($name, 4, "$name - Payload sequence $pid sent\n");
$st = "maintenance";
} else {
my $err = $!;
$err = $!;
$st = "write error: $err";
Log2Syslog_Log3slog($name, 3, "$name - Warning - Payload sequence $pid NOT sent: $err\n");
$st = "write error: $err";
}
my $uef = AttrVal($name, "useEOF", 0);
@ -1923,13 +1923,11 @@ sub Log2Syslog_setprival {
$sv = 7 if ($vbose == 5);
}
if (lc($txt) =~ m/error/) {
# error condition
if (lc($txt) =~ m/error/) { # error condition und exludes anwenden
$do = 1;
my $ees = AttrVal($name, "exclErrCond", "");
if($ees) {
$ees =~ m/^\s*(.*)\s*$/s;
$ees = $1;
$ees = Log2Syslog_trim($ees);
$ees =~ s/[\n]//g;
$ees =~ s/,,/_ESC_/g;
my @excl = split(",",$ees);