From ece3afa80f94f2d36bca7eeb783f27b7f6a40ba4 Mon Sep 17 00:00:00 2001 From: markusbloch <> Date: Mon, 10 Mar 2014 16:58:36 +0000 Subject: [PATCH] PRESENCE: use getlogin and getpwuid to obtain FHEM username; use usleep instead of sleep. git-svn-id: https://svn.fhem.de/fhem/trunk@5188 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/73_PRESENCE.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/73_PRESENCE.pm b/fhem/FHEM/73_PRESENCE.pm index 6fc097610..388a5ef8a 100755 --- a/fhem/FHEM/73_PRESENCE.pm +++ b/fhem/FHEM/73_PRESENCE.pm @@ -30,7 +30,7 @@ package main; use strict; use warnings; use Blocking; -use Time::HiRes qw(gettimeofday sleep); +use Time::HiRes qw(gettimeofday usleep sleep); use DevIo; @@ -62,7 +62,7 @@ PRESENCE_Define($$) my ($hash, $def) = @_; my @a = split("[ \t]+", $def); my $dev; - my $username = (getpwuid($<))[0]; + my $username = getlogin || getpwuid($<) || "[unknown]"; if(defined($a[2]) and defined($a[3])) { @@ -582,7 +582,7 @@ PRESENCE_ExecuteFritzBoxCMD($$) qx(touch /var/tmp/fhem-PRESENCE-cmd-lock.tmp); $status = qx($cmd); - + usleep 200000; unlink("/var/tmp/fhem-PRESENCE-cmd-lock.tmp") if(-e "/var/tmp/fhem-PRESENCE-cmd-lock.tmp"); return $status; @@ -668,7 +668,7 @@ PRESENCE_DoLocalFritzBoxScan($) } $number++; - sleep 0.2; + } return ($status == 0 ? "$name|$local|absent" : "$name|$local|present").($number <= $max ? "|$number" : "");