FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-25 22:09:21 +00:00
Code Issues Releases Wiki Activity

49_SSCam: FHEM crash when sending data by telegramBot Forum:#105486

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20534 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-11-18 17:50:17 +00:00
parent 375f353a84
commit 306d1aac31
3 changed files with 9 additions and 7 deletions
Show Stats 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.
- bugfix: 49_SSCam: FHEM crash when sending data by telegramBot Forum:#105486
- bugfix: 98_WeekTimer: fixed deletion of delayed timers (#104272)
- bugfix: 73_AutoShuttersControl: fix brightness morning drive in with
roommate condition

3
fhem/FHEM/49_SSCam.pm
View File

@ -54,6 +54,7 @@ eval "use Cache::Cache;1;" or my $SScamMMCacheCache = "Cache::Cache";
# Versions History intern
our %SSCam_vNotesIntern = (
"9.0.4" => "18.11.2019 fix FHEM crash when sending data by telegramBot, Forum: https://forum.fhem.de/index.php/topic,105486.0.html ",
"9.0.3" => "04.11.2019 change send Telegram routines, undef variables, fix cache and transaction coding, fix sendEmailblocking ",
"9.0.2" => "03.11.2019 change Streamdev type \"lastsnap\" use \$data Hash or CHI cache ",
"9.0.1" => "02.11.2019 correct snapgallery number of snaps in case of cache usage, fix display number of retrieved snaps ",
@ -8813,7 +8814,7 @@ sub SSCam_TBotSendIt($$$$$$$;$$$) {
$hash->{sentMsgOptions} = $options;
# init param hash
# $hash->{HU_DO_PARAMS}->{hash} = $hash;
$hash->{HU_DO_PARAMS}->{hash} = $hash;
$hash->{HU_DO_PARAMS}->{header} = $SSCam_TBotHeader;
delete $hash->{HU_DO_PARAMS}{args};
delete $hash->{HU_DO_PARAMS}{boundary};

12
fhem/contrib/DS_Starter/49_SSCam.pm
View File

@ -1,5 +1,5 @@
########################################################################################################################
# $Id: 49_SSCam.pm 20353 2019-10-12 05:50:49Z DS_Starter $
# $Id: 49_SSCam.pm 20469 2019-11-06 22:58:20Z DS_Starter $
#########################################################################################################################
# 49_SSCam.pm
#
@ -54,6 +54,7 @@ eval "use Cache::Cache;1;" or my $SScamMMCacheCache = "Cache::Cache";
# Versions History intern
our %SSCam_vNotesIntern = (
"9.0.4" => "18.11.2019 fix FHEM crash when sending data by telegramBot, Forum: https://forum.fhem.de/index.php/topic,105486.0.html ",
"9.0.3" => "04.11.2019 change send Telegram routines, undef variables, fix cache and transaction coding, fix sendEmailblocking ",
"9.0.2" => "03.11.2019 change Streamdev type \"lastsnap\" use \$data Hash or CHI cache ",
"9.0.1" => "02.11.2019 correct snapgallery number of snaps in case of cache usage, fix display number of retrieved snaps ",
@ -8813,7 +8814,7 @@ sub SSCam_TBotSendIt($$$$$$$;$$$) {
$hash->{sentMsgOptions} = $options;
# init param hash
# $hash->{HU_DO_PARAMS}->{hash} = $hash;
$hash->{HU_DO_PARAMS}->{hash} = $hash;
$hash->{HU_DO_PARAMS}->{header} = $SSCam_TBotHeader;
delete $hash->{HU_DO_PARAMS}{args};
delete $hash->{HU_DO_PARAMS}{boundary};
@ -9580,8 +9581,7 @@ sub SSCam_cleanData($;$) {
my $hash = $defs{$name};
my $del = 0;
RemoveInternalTimer($hash, "SSCam_cleanData");
#my $tac = $hash->{HELPER}{TRANSACTION};
RemoveInternalTimer($hash, "SSCam_cleanData");
if($data{SSCam}{$name}{SENDCOUNT}{$tac} && $data{SSCam}{$name}{SENDCOUNT}{$tac} > 0) { # Cacheinhalt erst löschen wenn Sendezähler 0
InternalTimer(gettimeofday()+1, "SSCam_cleanData", "$name:$tac", 0);
@ -9942,12 +9942,12 @@ sub SSCam_setVersionInfo($) {
if($modules{$type}{META}{x_prereqs_src} && !$hash->{HELPER}{MODMETAABSENT}) {
# META-Daten sind vorhanden
$modules{$type}{META}{version} = "v".$v; # Version aus META.json überschreiben, Anzeige mit {Dumper $modules{SMAPortal}{META}}
if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 49_SSCam.pm 20353 2019-10-12 05:50:49Z DS_Starter $ im Kopf komplett! vorhanden )
if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 49_SSCam.pm 20469 2019-11-06 22:58:20Z DS_Starter $ im Kopf komplett! vorhanden )
$modules{$type}{META}{x_version} =~ s/1.1.1/$v/g;
} else {
$modules{$type}{META}{x_version} = $v;
}
return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 49_SSCam.pm 20353 2019-10-12 05:50:49Z DS_Starter $ im Kopf komplett! vorhanden )
return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 49_SSCam.pm 20469 2019-11-06 22:58:20Z DS_Starter $ im Kopf komplett! vorhanden )
if(__PACKAGE__ eq "FHEM::$type" || __PACKAGE__ eq $type) {
# es wird mit Packages gearbeitet -> Perl übliche Modulversion setzen
# mit {<Modul>->VERSION()} im FHEMWEB kann Modulversion abgefragt werden