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

74_Nmap: enhances logging

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13819 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
igami 2017-03-27 18:49:08 +00:00
parent 7bb98ab761
commit 6e1ad08fe5
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/74_Nmap.pm
View File

@ -134,6 +134,8 @@ sub Nmap_Set($@) {
"statusRequest" => "statusRequest:noArg" "statusRequest" => "statusRequest:noArg"
); );
Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_Set");
return( return(
"Unknown argument $argument, choose one of " "Unknown argument $argument, choose one of "
. join(" ", values %Nmap_sets) . join(" ", values %Nmap_sets)
@ -175,6 +177,8 @@ sub Nmap_Attr(@) {
my ($cmd, $SELF, $attribute, $value) = @_; my ($cmd, $SELF, $attribute, $value) = @_;
my $hash = $defs{$SELF}; my $hash = $defs{$SELF};
Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_Attr");
if($attribute eq "args"){ if($attribute eq "args"){
$hash->{ARGS} = $cmd eq "set" ? $value : "-sn"; $hash->{ARGS} = $cmd eq "set" ? $value : "-sn";
} }
@ -256,6 +260,8 @@ sub Nmap_statusRequest($) {
my $timeout = $interval - 1; my $timeout = $interval - 1;
my $path = $hash->{PATH}; my $path = $hash->{PATH};
Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_statusRequest");
BlockingKill($hash->{helper}{RUNNING_PID}) BlockingKill($hash->{helper}{RUNNING_PID})
if(defined($hash->{helper}{RUNNING_PID})); if(defined($hash->{helper}{RUNNING_PID}));
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
@ -288,6 +294,7 @@ sub Nmap_statusRequest($) {
readingsSingleUpdate($hash, "state", "running", 1); readingsSingleUpdate($hash, "state", "running", 1);
Log3($SELF, 3, "$TYPE ($SELF) - starting network scan"); Log3($SELF, 3, "$TYPE ($SELF) - starting network scan");
Log3($SELF, 5, "$TYPE ($SELF) - BlockingCall Nmap_blocking_statusRequest");
$hash->{helper}{RUNNING_PID} = BlockingCall( $hash->{helper}{RUNNING_PID} = BlockingCall(
"Nmap_blocking_statusRequest", $SELF, "Nmap_done" "Nmap_blocking_statusRequest", $SELF, "Nmap_done"
@ -312,6 +319,8 @@ sub Nmap_blocking_statusRequest($) {
$args .= " --exclude $excludeHosts" if($excludeHosts); $args .= " --exclude $excludeHosts" if($excludeHosts);
my $STDERR = ""; my $STDERR = "";
Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_blocking_statusRequest");
close STDERR; close STDERR;
open(STDERR, ">", \$STDERR); open(STDERR, ">", \$STDERR);
@ -354,6 +363,8 @@ sub Nmap_done($) {
my %knownHosts = map{$_, 0} split(",", ReadingsVal($SELF, ".knownHosts", "")); my %knownHosts = map{$_, 0} split(",", ReadingsVal($SELF, ".knownHosts", ""));
my $metaReadingAttrVal = AttrVal($SELF, "metaReading", "ip"); my $metaReadingAttrVal = AttrVal($SELF, "metaReading", "ip");
Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_done");
delete($hash->{helper}{RUNNING_PID}); delete($hash->{helper}{RUNNING_PID});
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
@ -507,6 +518,8 @@ sub Nmap_deleteOldReadings($$) {
my $TYPE = $hash->{TYPE}; my $TYPE = $hash->{TYPE};
$value = eval($value); $value = eval($value);
Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_deleteOldReadings");
unless(looks_like_number($value)){ unless(looks_like_number($value)){
my $ret = "no numeric value given for deleteOldReadings"; my $ret = "no numeric value given for deleteOldReadings";
@ -539,6 +552,8 @@ sub Nmap_updateUptime($$;$) {
my ($hash, $metaReading, $uptime) = @_; my ($hash, $metaReading, $uptime) = @_;
my $SELF = $hash->{NAME}; my $SELF = $hash->{NAME};
Log3($SELF, 5, "$TYPE ($SELF) - entering Nmap_updateUptime");
$uptime = ( $uptime = (
ReadingsVal($SELF, $metaReading."_uptime", 0) ReadingsVal($SELF, $metaReading."_uptime", 0)
+ ReadingsAge($SELF, $metaReading."_uptime", 0) + ReadingsAge($SELF, $metaReading."_uptime", 0)