mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

77_SMAEM: V3.0.1, use abort cause of BlockingCall

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15503 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2017-11-26 08:24:59 +00:00
parent 7ab097ec59
commit 2d35a7b2ff
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- change: 77_SMAEM: V3.0.1, use abort cause of BlockingCall
- change: 93_Log2Syslog: V3.2.0, add NOTIFYDEV (if possible)
- change: 70_BRAVIA: set remoteControl supports command codes
- change: 98_dewpoint: Consolidated and corrected formulas for dewpoint

10
fhem/FHEM/77_SMAEM.pm
View File

@@ -26,6 +26,7 @@
#################################################################################################
# Versions History done by DS_Starter
#
# 3.0.1 26.11.2017 use abort cause of BlockingCall
# 3.0.0 29.09.2017 make SMAEM ready for multimeter usage
# 2.9.1 29.05.2017 DbLog_splitFn added, some function names adapted
# 2.9.0 25.05.2017 own SMAEM_setCacheValue, SMAEM_getCacheValue, new internal VERSION
@@ -51,7 +52,7 @@ use bignum;
use IO::Socket::Multicast;
use Blocking;
my $SMAEMVersion = "3.0.0";
my $SMAEMVersion = "3.0.1";
###############################################################
# SMAEM Initialize
@@ -604,14 +605,15 @@ return;
# Abbruchroutine Timeout Inverter Abfrage
###############################################################
sub SMAEM_ParseAborted($) {
my ($hash) = @_;
my ($hash,$cause) = @_;
my $name = $hash->{NAME};
my $discycles = $hash->{HELPER}{FAULTEDCYCLES};
$cause = $cause?$cause:"Timeout: process terminated";
$discycles++;
$hash->{HELPER}{FAULTEDCYCLES} = $discycles;
Log3 ($name, 1, "SMAEM $name -> BlockingCall $hash->{HELPER}{RUNNING_PID}{fn} timed out");
readingsSingleUpdate($hash, "state", "timeout", 1);
Log3 ($name, 1, "SMAEM $name -> BlockingCall $hash->{HELPER}{RUNNING_PID}{fn} $cause");
readingsSingleUpdate($hash, "state", $cause, 1);
delete($hash->{HELPER}{RUNNING_PID});
}