FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

39_alexa.pm: better parsing of alexa-fhem output

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18863 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2019-03-11 18:33:28 +00:00
parent f35520e083
commit 04dbe9f793
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/FHEM/39_alexa.pm
View File

@ -238,7 +238,7 @@ alexa_detailFn($$$$)
my $ret;
my $logfile = AttrVal($name, 'alexaFHEM-log', 'FHEM' );
if( $logfile ne 'FHEM' ) {
if( $logfile && $logfile ne 'FHEM' ) {
my $name = 'alexaFHEMlog';
$ret .= "<a href=\"$FW_ME?detail=$name\">". AttrVal($name, "alias", "Logfile") ."</a><br>";
}
@ -255,21 +255,32 @@ alexa_Read($)
my $buf = CoProcess::readFn($hash);
return undef if( !$buf );
if( $buf =~ m/^\*\*\* ([^\s]+) (.+)/ ) {
my $service = $1;
my $message = $2;
my $data = $hash->{helper}{PARTIAL};
$data .= $buf;
if( $service eq 'FHEM:' ) {
if( $message =~ m/^connection failed(: (.*))?/ ) {
my $reason = $2;
while($data =~ m/\n/) {
($buf,$data) = split("\n", $data, 2);
$hash->{reason} = 'failed to connect to fhem';
$hash->{reason} .= ": $reason" if( $reason );
CoProcess::stop($hash);
Log3 $name, 5, "$name: read: $buf";
if( $buf =~ m/^\*\*\* ([^\s]+) (.+)/ ) {
my $service = $1;
my $message = $2;
if( $service eq 'FHEM:' ) {
if( $message =~ m/^connection failed(: (.*))?/ ) {
my $reason = $2;
$hash->{reason} = 'failed to connect to fhem';
$hash->{reason} .= ": $reason" if( $reason );
CoProcess::stop($hash);
}
}
}
}
$hash->{PARTIAL} = $data;
return undef;
}