FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 23:06:37 +00:00
Code Issues Releases Wiki Activity

98_fheminfo.pm: send blocking unless called with $cl

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14764 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2017-07-22 15:08:33 +00:00
parent d4bef8bc4a
commit b4f6a5ffac
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/98_fheminfo.pm
View File

@ -59,7 +59,7 @@ sub CommandFheminfo($$) {
return toJSON(\%fhemInfo); return toJSON(\%fhemInfo);
} }
_fi2_Send() if $doSend; _fi2_Send($cl) if $doSend;
# do not return statistics data if called from update # do not return statistics data if called from update
return "Statistics data sent to server. See Logfile (level 4) for details." unless defined($cl); return "Statistics data sent to server. See Logfile (level 4) for details." unless defined($cl);
@ -145,7 +145,10 @@ sub _fi2_Count() {
return; return;
} }
sub _fi2_Send() { sub _fi2_Send($) {
my ($cl) = shift;
$cl //= undef;
my $json = toJSON(\%fhemInfo); my $json = toJSON(\%fhemInfo);
Log3("fheminfo",4,"fheminfo: $json"); Log3("fheminfo",4,"fheminfo: $json");
@ -154,7 +157,8 @@ sub _fi2_Send() {
$hu_hash{url} = $cmds{fheminfo}{uri}; $hu_hash{url} = $cmds{fheminfo}{uri};
$hu_hash{data} = "uniqueID=".$fhemInfo{$c_system}{'uniqueID'}."&json=$json"; $hu_hash{data} = "uniqueID=".$fhemInfo{$c_system}{'uniqueID'}."&json=$json";
$hu_hash{header} = "User-Agent: FHEM"; $hu_hash{header} = "User-Agent: FHEM";
$hu_hash{callback} = sub($$$) { if (defined($cl)) {
$hu_hash{callback} = sub($$$) {
my ($hash, $err, $data) = @_; my ($hash, $err, $data) = @_;
if($err) { if($err) {
Log 1, "fheminfo send: Server ERROR: $err"; Log 1, "fheminfo send: Server ERROR: $err";
@ -162,7 +166,15 @@ sub _fi2_Send() {
Log3("fheminfo",4,"fheminfo send: Server RESPONSE: $data"); Log3("fheminfo",4,"fheminfo send: Server RESPONSE: $data");
} }
}; };
HttpUtils_NonblockingGet(\%hu_hash); HttpUtils_NonblockingGet(\%hu_hash);
} else {
my ($err, $data) = HttpUtils_BlockingGet(\%hu_hash);
if($err) {
Log 1, "fheminfo send: Server ERROR: $err";
} else {
Log3("fheminfo",4,"fheminfo send: Server RESPONSE: $data");
}
}
return; return;
} }