Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_freezemon.pm: new Attribute for extended details

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16219 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
KernSani 2018-02-18 21:55:20 +00:00
parent 696cd29900
commit 0048a23a15
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fhem/FHEM/98_freezemon.pm
View File

@ -22,6 +22,8 @@
# #
############################################################################## ##############################################################################
# Changelog: # Changelog:
# 0.0.13: added extended Details attribute
# optimization of logging
# 0.0.12: problem with older perl versions (Forum #764462) # 0.0.12: problem with older perl versions (Forum #764462)
# Small improvement in device detection # Small improvement in device detection
# added ignoreDev and ignorMode attribute # added ignoreDev and ignorMode attribute
@ -71,7 +73,7 @@ use POSIX;
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
use B qw(svref_2object); use B qw(svref_2object);
my $version = "0.0.12"; my $version = "0.0.13";
################################### ###################################
sub freezemon_Initialize($) { sub freezemon_Initialize($) {
@ -80,7 +82,7 @@ sub freezemon_Initialize($) {
# Module specific attributes # Module specific attributes
my @freezemon_attr = my @freezemon_attr =
("fm_forceApptime:0,1 fm_freezeThreshold disable:0,1 fm_log fm_ignoreDev fm_ignoreMode:off,single,all"); ("fm_forceApptime:0,1 fm_freezeThreshold disable:0,1 fm_log fm_ignoreDev fm_ignoreMode:off,single,all fm_extDetail:0,1");
$hash->{GetFn} = "freezemon_Get"; $hash->{GetFn} = "freezemon_Get";
$hash->{SetFn} = "freezemon_Set"; $hash->{SetFn} = "freezemon_Set";
@ -177,7 +179,7 @@ sub freezemon_ProcessTimer($) {
# Find the internal timers that are still in the hash # Find the internal timers that are still in the hash
my @olddev = split( " ", $dev ); my @olddev = split( " ", $dev );
my @newdev = split( " ", freezemon_apptime() ); my @newdev = split( " ", freezemon_apptime($hash) );
my %nd = map { $_ => 1 } @newdev; my %nd = map { $_ => 1 } @newdev;
foreach my $d (@olddev) { foreach my $d (@olddev) {
@ -242,7 +244,7 @@ sub freezemon_ProcessTimer($) {
# Build hash with 20 last freezes # Build hash with 20 last freezes
my @freezes = (); my @freezes = ();
push @freezes, split( ",", ReadingsVal( $name, ".fm_freezes", undef ) ); push @freezes, split( ",", ReadingsVal( $name, ".fm_freezes", "" ) );
push @freezes, strftime( "%Y-%m-%d", localtime ) . ": s:$start e:$end f:$freeze d:$dev"; push @freezes, strftime( "%Y-%m-%d", localtime ) . ": s:$start e:$end f:$freeze d:$dev";
#while (keys @freezes > 20) { #problem with older Perl versions #while (keys @freezes > 20) { #problem with older Perl versions
@ -314,7 +316,7 @@ sub freezemon_ProcessTimer($) {
# start next timer # start next timer
$hash->{helper}{fn} = ""; $hash->{helper}{fn} = "";
$hash->{helper}{apptime} = freezemon_apptime(); $hash->{helper}{apptime} = freezemon_apptime($hash);
$hash->{helper}{TIMER} = int($now) + 1; $hash->{helper}{TIMER} = int($now) + 1;
InternalTimer( $hash->{helper}{TIMER}, 'freezemon_ProcessTimer', $hash, 0 ); InternalTimer( $hash->{helper}{TIMER}, 'freezemon_ProcessTimer', $hash, 0 );
} }
@ -472,7 +474,10 @@ sub freezemon_start($) {
} }
################################### ###################################
sub freezemon_apptime() { sub freezemon_apptime($) {
my ($hash) = @_;
my $name = $hash->{NAME};
my @intAtKeys = keys(%intAt); my @intAtKeys = keys(%intAt);
my $now = gettimeofday(); my $now = gettimeofday();
my $minCoverExec = 10; # Let's see if we can find more if we look ahead further my $minCoverExec = 10; # Let's see if we can find more if we look ahead further
@ -502,7 +507,7 @@ sub freezemon_apptime() {
$cv = svref_2object($fn); $cv = svref_2object($fn);
$fnname = $cv->GV->NAME; $fnname = $cv->GV->NAME;
$ret .= $intAt{$i}{TRIGGERTIME} . "-" . $fnname; $ret .= $intAt{$i}{TRIGGERTIME} . "-" . $fnname;
Log3 undef, 5, "Freezemon: Reference found: " . ref($fn) . "/$fnname/$fn"; Log3 $name, 5, "Freezemon: Reference found: " . ref($fn) . "/$fnname/$fn";
} }
else { else {
$ret .= $intAt{$i}{TRIGGERTIME} . "-" . $fn; $ret .= $intAt{$i}{TRIGGERTIME} . "-" . $fn;
@ -512,6 +517,7 @@ sub freezemon_apptime() {
$shortarg = ( defined($arg) ? $arg : "" ); $shortarg = ( defined($arg) ? $arg : "" );
if ( ref($shortarg) eq "HASH" ) { if ( ref($shortarg) eq "HASH" ) {
if ( !defined( $shortarg->{NAME} ) ) { if ( !defined( $shortarg->{NAME} ) ) {
if (AttrVal($name,"fm_extDetail",0) == 1) {
if ( $fn eq "BlockingKill" ) { if ( $fn eq "BlockingKill" ) {
$shortarg = $shortarg->{abortArg}{NAME}; $shortarg = $shortarg->{abortArg}{NAME};
} }
@ -519,7 +525,11 @@ sub freezemon_apptime() {
$shortarg = $shortarg->{hash}{hash}{NAME}; $shortarg = $shortarg->{hash}{hash}{NAME};
} }
else { else {
Log3 undef, 5, "Freezemon: found something without a name $fn" . Dumper($shortarg); Log3 $name, 5, "Freezemon: found something without a name $fn" . Dumper($shortarg);
$shortarg = "N/A";
}
}
else {
$shortarg = "N/A"; $shortarg = "N/A";
} }
} }
@ -533,15 +543,15 @@ sub freezemon_apptime() {
$shortarg = $deref->{'hash'}{NAME}; #at least in DOIF_TimerTrigger $shortarg = $deref->{'hash'}{NAME}; #at least in DOIF_TimerTrigger
} }
else { else {
Log3 undef, 5, "Freezemon: found a REF $fn " . Dumper( ${$arg} ); Log3 $name, 5, "Freezemon: found a REF $fn " . Dumper( ${$arg} );
} }
} }
else { else {
#Log3 undef, 3, "Freezemon: found something that's not a HASH $fn ".ref($shortarg)." ".Dumper($shortarg); #Log3 $name, 3, "Freezemon: found something that's not a HASH $fn ".ref($shortarg)." ".Dumper($shortarg);
$shortarg = "N/A"; $shortarg = "N/A";
} }
if ( !$shortarg ) { if ( !$shortarg ) {
Log3 undef, 5, "Freezemon: something went wrong $fn " . Dumper($arg); Log3 $name, 5, "Freezemon: something went wrong $fn " . Dumper($arg);
$shortarg = ""; $shortarg = "";
} }
else { else {
@ -552,7 +562,7 @@ sub freezemon_apptime() {
if (%prioQueues) { if (%prioQueues) {
my $nice = minNum( keys %prioQueues ); my $nice = minNum( keys %prioQueues );
my $entry = shift( @{ $prioQueues{$nice} } ); my $entry = shift( @{ $prioQueues{$nice} } );
Log3 undef, 5, "Freezemon: found a prioQueue" . Dumper($entry); Log3 $name, 5, "Freezemon: found a prioQueue" . Dumper($entry);
$cv = svref_2object( $entry->{fn} ); $cv = svref_2object( $entry->{fn} );
$fnname = $cv->GV->NAME; $fnname = $cv->GV->NAME;
$ret .= ":" . $shortarg; $ret .= ":" . $shortarg;
@ -632,6 +642,7 @@ sub freezemon_apptime() {
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<ul> <ul>
<li>fm_extDetail: provides in some cases extended details for recognized freezes. In some cases it was reported that FHEM crashes, so please be careful.</li>
<li>fm_freezeThreshold: Value in seconds (Default: 1) - Only freezes longer than fm_freezeThreshold will be considered as a freeze</li> <li>fm_freezeThreshold: Value in seconds (Default: 1) - Only freezes longer than fm_freezeThreshold will be considered as a freeze</li>
<li>fm_forceApptime: When FREEZEMON is active, apptime will automatically be started (if not yet active)</li> <li>fm_forceApptime: When FREEZEMON is active, apptime will automatically be started (if not yet active)</li>
<li>fm_ignoreDev: list of comma separated Device names. If all devices possibly causing a freeze are in the list, the freeze will be ignored (not logged)</li> <li>fm_ignoreDev: list of comma separated Device names. If all devices possibly causing a freeze are in the list, the freeze will be ignored (not logged)</li>
@ -710,6 +721,7 @@ sub freezemon_apptime() {
<b>Attribute</b> <b>Attribute</b>
<ul> <ul>
<ul> <ul>
<li>fm_extDetail: stellt in einigen Fällen zusätzliche Details bei erkannten Freezes zur Verfügung. In wenigen Fällen wurde berichtet, dass FHEM crasht, also vorsichtig verwenden.</li>
<li>fm_freezeThreshold: Wert in Sekunden (Default: 1) - Nur Freezes länger als fm_freezeThreshold werden als Freeze betrachtet </li> <li>fm_freezeThreshold: Wert in Sekunden (Default: 1) - Nur Freezes länger als fm_freezeThreshold werden als Freeze betrachtet </li>
<li>fm_forceApptime: Wenn FREEZEMON aktiv ist wird automatisch apptime gestartet (falls nicht aktiv)</li> <li>fm_forceApptime: Wenn FREEZEMON aktiv ist wird automatisch apptime gestartet (falls nicht aktiv)</li>
<li>fm_ignoreDev: Liste von Komma-getrennten Devices. Wenn einzelne mÃglicherweise einen Freeze verursachenden Device in dieser Liste sind, wird der Freeze ignoriert (nicht geloggt). Bitte das Attribut fm_ignoreMode beachten</li> <li>fm_ignoreDev: Liste von Komma-getrennten Devices. Wenn einzelne mÃglicherweise einen Freeze verursachenden Device in dieser Liste sind, wird der Freeze ignoriert (nicht geloggt). Bitte das Attribut fm_ignoreMode beachten</li>