Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

93_Log2Syslog: contrib 5.6.3

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@19845 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-07-17 22:49:55 +00:00
parent f9459ba415
commit e2bb2267d6
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/DS_Starter/93_Log2Syslog.pm
View File

@ -41,6 +41,7 @@ eval "use FHEM::Meta;1" or my $modMetaAbsent = 1;
# Versions History intern: # Versions History intern:
our %Log2Syslog_vNotesIntern = ( our %Log2Syslog_vNotesIntern = (
"5.6.3" => "18.07.2019 fix state reading if changed disabled attribute ",
"5.6.2" => "17.07.2019 Forum: https://forum.fhem.de/index.php/topic,75426.msg958836.html#msg958836 ", "5.6.2" => "17.07.2019 Forum: https://forum.fhem.de/index.php/topic,75426.msg958836.html#msg958836 ",
"5.6.1" => "24.03.2019 prevent module from deactivation in case of unavailable Meta.pm ", "5.6.1" => "24.03.2019 prevent module from deactivation in case of unavailable Meta.pm ",
"5.6.0" => "23.03.2019 attribute exclErrCond to exclude events from rating as \"error\" ", "5.6.0" => "23.03.2019 attribute exclErrCond to exclude events from rating as \"error\" ",
@ -1265,7 +1266,7 @@ sub Log2Syslog_Attr ($$$$) {
} }
$do = 0 if($cmd eq "del"); $do = 0 if($cmd eq "del");
$st = ($do&&$aVal=~/maintenance/)?"maintenance":($do&&$aVal==1)?"disabled":"initialized"; $st = ($do&&$aVal=~/maintenance/)?"maintenance":($do&&$aVal==1)?"disabled":"initialized";
$hash->{HELPER}{MEMLOCK} = 1; $hash->{HELPER}{MEMLOCK} = 1;
InternalTimer(gettimeofday()+2, "Log2Syslog_deleteMemLock", $hash, 0); InternalTimer(gettimeofday()+2, "Log2Syslog_deleteMemLock", $hash, 0);
@ -1277,7 +1278,8 @@ sub Log2Syslog_Attr ($$$$) {
} else { } else {
Log2Syslog_closesock($hash,1); # Clientsocket schließen Log2Syslog_closesock($hash,1); # Clientsocket schließen
Log2Syslog_downServer($hash); # Serversocket schließen Log2Syslog_downServer($hash); # Serversocket schließen
} }
readingsSingleUpdate ($hash, 'state', $st, 1);
} }
if ($aName eq "TLS") { if ($aName eq "TLS") {
@ -1404,8 +1406,8 @@ sub Log2Syslog_eventlog($$) {
my ($prival,$data,$sock,$pid,$sevAstxt); my ($prival,$data,$sock,$pid,$sevAstxt);
if(IsDisabled($name)) { if(IsDisabled($name)) {
$st = AttrVal($name, "disable", "0"); # $st = AttrVal($name, "disable", "0");
$st = ($st =~ /maintenance/)?$st:"disabled"; # $st = ($st =~ /maintenance/)?$st:"disabled";
my $evt = ($st eq $hash->{HELPER}{OLDSTATE})?0:1; my $evt = ($st eq $hash->{HELPER}{OLDSTATE})?0:1;
readingsSingleUpdate($hash, "state", $st, $evt); readingsSingleUpdate($hash, "state", $st, $evt);
$hash->{HELPER}{OLDSTATE} = $st; $hash->{HELPER}{OLDSTATE} = $st;
@ -1480,8 +1482,8 @@ sub Log2Syslog_fhemlog($$) {
my ($prival,$sock,$err,$ret,$data,$pid,$sevAstxt); my ($prival,$sock,$err,$ret,$data,$pid,$sevAstxt);
if(IsDisabled($name)) { if(IsDisabled($name)) {
$st = AttrVal($name, "disable", "1"); # $st = AttrVal($name, "disable", "1");
$st = ($st =~ /maintenance/)?$st:"disabled"; # $st = ($st =~ /maintenance/)?$st:"disabled";
my $evt = ($st eq $hash->{HELPER}{OLDSTATE})?0:1; my $evt = ($st eq $hash->{HELPER}{OLDSTATE})?0:1;
readingsSingleUpdate($hash, "state", $st, $evt); readingsSingleUpdate($hash, "state", $st, $evt);
$hash->{HELPER}{OLDSTATE} = $st; $hash->{HELPER}{OLDSTATE} = $st;
@ -1628,7 +1630,7 @@ sub Log2Syslog_opensock ($;$$) {
my $host = $hash->{PEERHOST}; my $host = $hash->{PEERHOST};
my $port = AttrVal($name, "TLS", 0)?AttrVal($name, "port", 6514):AttrVal($name, "port", 514); my $port = AttrVal($name, "TLS", 0)?AttrVal($name, "port", 6514):AttrVal($name, "port", 514);
my $protocol = lc(AttrVal($name, "protocol", "udp")); my $protocol = lc(AttrVal($name, "protocol", "udp"));
my $st = ReadingsVal($name,"state","active"); my $st = "active";
my $timeout = AttrVal($name, "timeout", 0.5); my $timeout = AttrVal($name, "timeout", 0.5);
my $ssldbg = AttrVal($name, "ssldebug", 0); my $ssldbg = AttrVal($name, "ssldebug", 0);
my ($sock,$lo,$lof,$sslver,$sslalgo); my ($sock,$lo,$lof,$sslver,$sslalgo);