From 6e0e96ff7b560aea20ad17db7c802e8dee34b55c Mon Sep 17 00:00:00 2001 From: igami Date: Mon, 27 Mar 2017 18:49:08 +0000 Subject: [PATCH] 74_Nmap: enhances logging git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@13819 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/74_Nmap.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/FHEM/74_Nmap.pm b/FHEM/74_Nmap.pm index 2687553a0..f79778bc9 100644 --- a/FHEM/74_Nmap.pm +++ b/FHEM/74_Nmap.pm @@ -134,6 +134,8 @@ sub Nmap_Set($@) { "statusRequest" => "statusRequest:noArg" ); + Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_Set"); + return( "Unknown argument $argument, choose one of " . join(" ", values %Nmap_sets) @@ -175,6 +177,8 @@ sub Nmap_Attr(@) { my ($cmd, $SELF, $attribute, $value) = @_; my $hash = $defs{$SELF}; + Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_Attr"); + if($attribute eq "args"){ $hash->{ARGS} = $cmd eq "set" ? $value : "-sn"; } @@ -256,6 +260,8 @@ sub Nmap_statusRequest($) { my $timeout = $interval - 1; my $path = $hash->{PATH}; + Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_statusRequest"); + BlockingKill($hash->{helper}{RUNNING_PID}) if(defined($hash->{helper}{RUNNING_PID})); RemoveInternalTimer($hash); @@ -288,6 +294,7 @@ sub Nmap_statusRequest($) { readingsSingleUpdate($hash, "state", "running", 1); Log3($SELF, 3, "$TYPE ($SELF) - starting network scan"); + Log3($SELF, 5, "$TYPE ($SELF) - BlockingCall Nmap_blocking_statusRequest"); $hash->{helper}{RUNNING_PID} = BlockingCall( "Nmap_blocking_statusRequest", $SELF, "Nmap_done" @@ -312,6 +319,8 @@ sub Nmap_blocking_statusRequest($) { $args .= " --exclude $excludeHosts" if($excludeHosts); my $STDERR = ""; + Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_blocking_statusRequest"); + close STDERR; open(STDERR, ">", \$STDERR); @@ -354,6 +363,8 @@ sub Nmap_done($) { my %knownHosts = map{$_, 0} split(",", ReadingsVal($SELF, ".knownHosts", "")); my $metaReadingAttrVal = AttrVal($SELF, "metaReading", "ip"); + Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_done"); + delete($hash->{helper}{RUNNING_PID}); readingsBeginUpdate($hash); @@ -507,6 +518,8 @@ sub Nmap_deleteOldReadings($$) { my $TYPE = $hash->{TYPE}; $value = eval($value); + Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_deleteOldReadings"); + unless(looks_like_number($value)){ my $ret = "no numeric value given for deleteOldReadings"; @@ -539,6 +552,8 @@ sub Nmap_updateUptime($$;$) { my ($hash, $metaReading, $uptime) = @_; my $SELF = $hash->{NAME}; + Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_updateUptime"); + $uptime = ( ReadingsVal($SELF, $metaReading."_uptime", 0) + ReadingsAge($SELF, $metaReading."_uptime", 0)