FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 13:26:02 +00:00
Code Issues Releases Wiki Activity

00_FBAHAHTTP.pm: reconnect if the session is gone (Forum #58147)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12296 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-10-08 14:13:39 +00:00
parent 01fdb776bf
commit 1314fcf866
1 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
fhem/FHEM/00_FBAHAHTTP.pm
View File

@ -53,43 +53,53 @@ FBAHAHTTP_Define($$)
return undef; return undef;
} }
#####################################
sub sub
FBAHAHTTP_Poll($) FBAHAHTTP_connect($)
{ {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $dev = $hash->{DEF}; my $dev = $hash->{DEF};
return if(IsDisabled($name));
my $dr = sub { my $dr = sub {
$hash->{STATE} = $_[0]; $hash->{STATE} = $_[0];
Log 2, $hash->{STATE}; Log 2, $hash->{STATE};
return $hash->{STATE}; return $hash->{STATE};
}; };
if(!$hash->{".SID"}) { my $fb_user = AttrVal($name, "fritzbox-user", '');
my $fb_user = AttrVal($name, "fritzbox-user", ''); return $dr->("MISSING: attr $name fritzbox-user") if(!$fb_user);
return $dr->("MISSING: attr $name fritzbox-user") if(!$fb_user);
my ($err, $fb_pw) = getKeyValue("FBAHAHTTP_PASSWORD_$name"); my ($err, $fb_pw) = getKeyValue("FBAHAHTTP_PASSWORD_$name");
return $dr->("ERROR: $err") if($err); return $dr->("ERROR: $err") if($err);
return $dr->("MISSING: set $name password") if(!$fb_pw); return $dr->("MISSING: set $name password") if(!$fb_pw);
my $sid = FB_doCheckPW($hash->{DEF}, $fb_user, $fb_pw); my $sid = FB_doCheckPW($hash->{DEF}, $fb_user, $fb_pw);
if(!$sid) { if(!$sid) {
$hash->{NEXT_OPEN} = time()+60; $hash->{NEXT_OPEN} = time()+60;
$readyfnlist{"$name.$dev"} = $hash; $readyfnlist{"$name.$dev"} = $hash;
return $dr->("$name error: cannot get SID, ". return $dr->("$name error: cannot get SID, ".
"check connection/hostname/fritzbox-user/password") "check connection/hostname/fritzbox-user/password")
}
delete($readyfnlist{"$name.$dev"});
$hash->{".SID"} = $sid;
$hash->{STATE} = "connected";
} }
delete($readyfnlist{"$name.$dev"});
$hash->{".SID"} = $sid;
$hash->{STATE} = "connected";
return undef;
}
#####################################
sub
FBAHAHTTP_Poll($)
{
my ($hash) = @_;
my $name = $hash->{NAME};
return if(IsDisabled($name));
if(!$hash->{".SID"}) {
my $ret = FBAHAHTTP_connect($hash);
return $ret if($ret);
}
my $sid = $hash->{".SID"}; my $sid = $hash->{".SID"};
HttpUtils_NonblockingGet({ HttpUtils_NonblockingGet({
@ -193,8 +203,20 @@ FBAHAHTTP_ProcessStack($)
$hash->{CmdStack} = (); $hash->{CmdStack} = ();
return; return;
} }
chomp $_[2];
Log3 $name, 5, "FBAHAHTTP_Write reply for $name: $_[2]"; Log3 $name, 5, "FBAHAHTTP_Write reply for $name: $_[2]";
if(!defined($_[2]) || $_[2] eq "") {
if($hash->{INRETRY}) {
Log3 $name, 1, "No sensible respone after reconnect, giving up";
return;
}
$hash->{INRETRY} = 1;
return if(FBAHAHTTP_connect($hash));
FBAHAHTTP_ProcessStack($hash);
delete($hash->{INRETRY});
return;
}
shift @{$hash->{CmdStack}}; shift @{$hash->{CmdStack}};
if(@{$hash->{CmdStack}} > 0) { if(@{$hash->{CmdStack}} > 0) {
my $ad = AttrVal($name, "async_delay", 0); my $ad = AttrVal($name, "async_delay", 0);
@ -217,8 +239,9 @@ FBAHAHTTP_Write($$$)
my $sid = $hash->{".SID"}; my $sid = $hash->{".SID"};
if(!$sid) { if(!$sid) {
Log 1, "$name: Not connected, wont execute $msg"; my $ret = FBAHAHTTP_connect($hash); # try to reconnect
return; return $ret if($ret);
$sid = $hash->{".SID"};
} }
push(@{$hash->{CmdStack}}, "sid=$sid&ain=$fn&switchcmd=$msg"); push(@{$hash->{CmdStack}}, "sid=$sid&ain=$fn&switchcmd=$msg");
FBAHAHTTP_ProcessStack($hash) if(@{$hash->{CmdStack}} == 1); FBAHAHTTP_ProcessStack($hash) if(@{$hash->{CmdStack}} == 1);