FHEM/mod-AMAD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

komplettes rewrite des Errorhandlings, es wird nun versucht fehlermeldung Userfreundlich zu interpretieren,besseres debugging. Dokumentationsanpassung

Browse Source
This commit is contained in:
Marko Oldenburg
2015-09-01 14:48:42 +02:00
parent 41a34caedc
commit 4767617fe7
1 changed files with 147 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
74_AMAD.pm
View File

@ -2,7 +2,7 @@
# #
# Developed with Kate # Developed with Kate
# #
# (c) 2015 Copyright: Leon Gaultier (leongaultier at gmail dot com) # (c) 2015 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
# All rights reserved # All rights reserved
# #
# This script is free software; you can redistribute it and/or modify # This script is free software; you can redistribute it and/or modify
@ -33,7 +33,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
my $version = "0.5.6"; my $version = "0.5.7";
@ -107,29 +107,32 @@ sub AMAD_Attr(@) {
my $hash = $defs{$name}; my $hash = $defs{$name};
if ($attrName eq "disable") { if ($attrName eq "disable") {
if($cmd eq "set") {
if($attrVal eq "0") {
RemoveInternalTimer($hash);
InternalTimer(gettimeofday()+2, "AMAD_GetUpdateTimer", $hash, 0) if ($hash->{STATE} eq "disabled");
$hash->{STATE}='active';
Log3 $name, 3, "AMAD ($name) - enabled";
} else {
$hash->{STATE} = 'disabled';
RemoveInternalTimer($hash);
Log3 $name, 3, "AMAD ($name) - disabled";
}
} elsif ($cmd eq "del") {
RemoveInternalTimer($hash);
InternalTimer(gettimeofday()+2, "AMAD_GetUpdateTimer", $hash, 0) if ($hash->{STATE} eq "disabled");
$hash->{STATE}='active';
Log3 $name, 3, "AMAD ($name) - enabled";
}
} else {
if($cmd eq "set") { if($cmd eq "set") {
$attr{$name}{$attrName} = $attrVal; if($attrVal eq "0") {
Log3 $name, 3, "AMAD ($name) - $attrName : $attrVal"; RemoveInternalTimer($hash);
} elsif ($cmd eq "del") { InternalTimer(gettimeofday()+2, "AMAD_GetUpdateTimer", $hash, 0) if ($hash->{STATE} eq "disabled");
} $hash->{STATE}='active';
Log3 $name, 3, "AMAD ($name) - enabled";
} else {
$hash->{STATE} = 'disabled';
RemoveInternalTimer($hash);
Log3 $name, 3, "AMAD ($name) - disabled";
}
}
elsif ($cmd eq "del") {
RemoveInternalTimer($hash);
InternalTimer(gettimeofday()+2, "AMAD_GetUpdateTimer", $hash, 0) if ($hash->{STATE} eq "disabled");
$hash->{STATE}='active';
Log3 $name, 3, "AMAD ($name) - enabled";
} else {
if($cmd eq "set") {
$attr{$name}{$attrName} = $attrVal;
Log3 $name, 3, "AMAD ($name) - $attrName : $attrVal";
}
elsif ($cmd eq "del") {
}
}
} }
return undef; return undef;
@ -227,6 +230,7 @@ sub AMAD_RetrieveAutomagicInfo($)
} }
); );
Log3 $name, 4, "AMAD ($name) - NonblockingGet get URL"; Log3 $name, 4, "AMAD ($name) - NonblockingGet get URL";
Log3 $name, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfo: calling Host: $host";
} }
sub AMAD_RetrieveAutomagicInfoFinished($$$) sub AMAD_RetrieveAutomagicInfoFinished($$$)
@ -237,39 +241,76 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $host = $hash->{HOST}; my $host = $hash->{HOST};
Log3 $name, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: calling Host: $host"; Log3 $name, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: processed request data";
### Begin Error Handling
if (defined($err)) { if (defined($err)) {
if ($err ne "") if ($err ne "") {
{ $hash->{STATE} = $err if ($hash->{STATE} ne "initialized");
$hash->{STATE} = $err if ($hash->{STATE} ne "initialized");
readingsSingleUpdate ($hash,"lastStatusRequestError",$err,1); readingsBeginUpdate ($hash);
readingsSingleUpdate ($hash,"lastStatusRequestState","statusRequest_error",1); readingsBulkUpdate ($hash,"lastStatusRequestState","statusRequest_error");
Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: error while requesting AutomagicInfo: $err";
return; if ($err =~ /timed out/) {
} readingsBulkUpdate ($hash,"lastStatusRequestError","connect to your device is timed out. check network");
}
elsif ($err =~ /Keine Route zum Zielrechner/) {
readingsBulkUpdate ($hash,"lastStatusRequestError","no route to target. bad network configuration or network is down");
} else {
readingsBulkUpdate ($hash,"lastStatusRequestError","$err");
}
readingsEndUpdate ($hash,1);
Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: error while requesting AutomagicInfo: $err";
return;
}
} }
if($data eq "" and exists($param->{code})) if($data eq "" and exists($param->{code})) {
{
$hash->{STATE} = $param->{code} if ($hash->{STATE} ne "initialized"); $hash->{STATE} = $param->{code} if ($hash->{STATE} ne "initialized");
readingsBeginUpdate ($hash);
readingsBulkUpdate ($hash,"lastStatusRequestState","statusRequest_error");
if ($param->{code} ne 200) { if ($param->{code} ne 200) {
readingsSingleUpdate ($hash,"lastStatusRequestError",$param->{code},1); readingsBulkUpdate ($hash,"lastStatusRequestError","http Error ".$param->{code});
} else {
readingsSingleUpdate ($hash,"lastStatusRequestState","statusRequest_done",1);
} }
Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: received http code ".$param->{code}." without any data after requesting AMAD AutomagicInfo"; readingsBulkUpdate ($hash,"lastStatusRequestError","empty response, check automagic on your device");
return; readingsEndUpdate ($hash,1);
Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: received http code ".$param->{code}." without any data after requesting AMAD AutomagicInfo";
return;
} }
if ($data eq "") { if($data =~ /\Error/i and exists($param->{code})) {
readingsSingleUpdate ($hash,"lastStatusRequestState","statusRequest_error",1); $hash->{STATE} = $param->{code} if ($hash->{STATE} ne "initialized");
} else {
readingsSingleUpdate ($hash,"lastStatusRequestState","statusRequest_done",1); readingsBeginUpdate($hash);
readingsBulkUpdate ($hash,"lastStatusRequestState","statusRequest_error");
if ($param->{code} eq 404) {
readingsBulkUpdate ($hash,"lastStatusRequestError","automagic information flow is inactive on your device!");
} else {
readingsBulkUpdate ($hash,"lastStatusRequestError","http error ".$param->{code});
}
readingsEndUpdate ($hash,1);
Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: received http code ".$param->{code}." receive Error after requesting AMAD AutomagicInfo";
return;
} }
### End Error Handling
### Begin Response Processing
$hash->{STATE} = "active" if ($hash->{STATE} eq "initialized" || $hash->{STATE} ne "active"); $hash->{STATE} = "active" if ($hash->{STATE} eq "initialized" || $hash->{STATE} ne "active");
my @valuestring = split('@@@@', $data); my @valuestring = split('@@@@', $data);
@ -279,14 +320,20 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$)
$buffer{$values[0]} = $values[1]; $buffer{$values[0]} = $values[1];
} }
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
my $t; my $t;
my $v; my $v;
while (($t, $v) = each %buffer) { while (($t, $v) = each %buffer) {
$v =~ s/null//g; $v =~ s/null//g;
readingsBulkUpdate($hash, $t, $v) if (defined($v)); readingsBulkUpdate($hash, $t, $v) if (defined($v));
} }
readingsBulkUpdate ($hash,"lastStatusRequestState","statusRequest_done");
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
### End Response Processing
$hash->{STATE} = "active" if ($hash->{STATE} eq "initialized"); $hash->{STATE} = "active" if ($hash->{STATE} eq "initialized");
@ -332,32 +379,65 @@ sub AMAD_HTTP_POSTerrorHandling($$$)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
### Begin Error Handling
if (defined($err)) { if (defined($err)) {
if ($err ne "") if ($err ne "") {
{
$hash->{STATE} = $err if ($hash->{STATE} ne "initialized"); $hash->{STATE} = $err if ($hash->{STATE} ne "initialized");
readingsSingleUpdate ($hash,"lastSetCommandError",$err,1);
readingsSingleUpdate ($hash,"lastSetCommandState","cmd_error",1); readingsBeginUpdate ($hash);
Log3 $name, 5, "AMAD ($name) - AMAD_HTTP_POST: error while send SetCommand: $err"; readingsBulkUpdate ($hash,"lastSetCommandState","cmd_error");
if ($err =~ /timed out/) {
readingsBulkUpdate ($hash,"lastSetCommandError","connect to your device is timed out. check network");
}
elsif ($err =~ /Keine Route zum Zielrechner/) {
readingsBulkUpdate ($hash,"lastSetCommandError","no route to target. bad network configuration or network is down");
} else {
readingsBulkUpdate ($hash,"lastSetCommandError","$err");
}
readingsEndUpdate ($hash,1);
Log3 $name, 5, "AMAD ($name) - AMAD_HTTP_POST: error while POST Command: $err";
return; return;
} }
} }
if($data eq "" and exists($param->{code})) if($data eq "" and exists($param->{code})) {
{
$hash->{STATE} = $param->{code} if ($hash->{STATE} ne "initialized"); $hash->{STATE} = $param->{code} if ($hash->{STATE} ne "initialized");
if ($param->{code} ne 200) { readingsBeginUpdate ($hash);
readingsSingleUpdate ($hash,"lastSetCommandError",$param->{code},1);
} else { if ($param->{code} ne 200) {
readingsSingleUpdate ($hash,"lastSetCommandState","cmd_done",1); readingsBulkUpdate ($hash,"lastSetCommandState","cmd_error");
} readingsBulkUpdate ($hash,"lastSetCommandError","http Error ".$param->{code});
}
readingsBulkUpdate ($hash,"lastSetCommandState","cmd_done");
readingsEndUpdate ($hash,1);
Log3 $name, 5, "AMAD ($name) - AMAD_HTTP_POST: received http code ".$param->{code};
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
AMAD_GetUpdateLocal($hash);
Log3 $name, 5, "AMAD ($name) - AMAD_HTTP_POST: received http code ".$param->{code}." without any data after send SetCommand";
return; return;
} }
readingsSingleUpdate ($hash,"lastSetCommandState","cmd_done",1); if($data =~ /\Error/i and exists($param->{code})) {
$hash->{STATE} = $param->{code} if ($hash->{STATE} ne "initialized");
readingsBeginUpdate($hash);
readingsBulkUpdate ($hash,"lastSetCommandState","cmd_error");
if ($param->{code} eq 404) {
readingsBulkUpdate ($hash,"lastSetCommandError","automagic setcommand flow is inactive on your device!");
} else {
readingsBulkUpdate ($hash,"lastSetCommandError","http error ".$param->{code});
}
}
readingsEndUpdate ($hash,1);
### End Error Handling
return undef; return undef;
} }
@ -399,8 +479,6 @@ sub AMAD_SelectSetCmd($$@)
readingsSingleUpdate ($hash,$cmd,$vol,1); readingsSingleUpdate ($hash,$cmd,$vol,1);
AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }
@ -425,8 +503,6 @@ sub AMAD_SelectSetCmd($$@)
my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setBrightness?brightness=$bri"; my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setBrightness?brightness=$bri";
AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }
@ -435,8 +511,6 @@ sub AMAD_SelectSetCmd($$@)
my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setScreenOnOff?screen=$mod"; my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setScreenOnOff?screen=$mod";
AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }
@ -445,8 +519,6 @@ sub AMAD_SelectSetCmd($$@)
my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setScreenOrientation?orientation=$mod"; my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setScreenOrientation?orientation=$mod";
AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }
@ -474,8 +546,6 @@ sub AMAD_SelectSetCmd($$@)
my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setAlarm?hour=".$alarm[0]."&minute=".$alarm[1]; my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setAlarm?hour=".$alarm[0]."&minute=".$alarm[1];
AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }