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

39_alexa.pm: some cleanups

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18282 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2019-01-16 16:12:33 +00:00
parent 1d43681fa6
commit 3b2d4a5e1c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
FHEM/39_alexa.pm
View File

@ -9,8 +9,10 @@ use warnings;
use JSON; use JSON;
use Data::Dumper; use Data::Dumper;
use POSIX ":sys_wait_h"; use POSIX;
use Socket;
use vars qw(%selectlist);
use vars qw(%modules); use vars qw(%modules);
use vars qw(%defs); use vars qw(%defs);
use vars qw(%attr); use vars qw(%attr);
@ -290,7 +292,7 @@ alexa_Read($)
if( $hash->{log} ) { if( $hash->{log} ) {
my @t = localtime(gettimeofday()); my @t = localtime(gettimeofday());
my $logfile = ResolveDateWildcards(AttrVal($name, 'alexaFHEM-log', 'FHEM' ), @t); my $logfile = ResolveDateWildcards($hash->{logfile}, @t);
alexa_openLogfile($hash, $logfile) if( $hash->{currentlogfile} ne $logfile ); alexa_openLogfile($hash, $logfile) if( $hash->{currentlogfile} ne $logfile );
} }
@ -541,11 +543,11 @@ alexa_startAlexaFHEM($)
#return undef if( ReadingsVal($name, 'alexaFHEM', 'unknown') =~ m/^running/ ); #return undef if( ReadingsVal($name, 'alexaFHEM', 'unknown') =~ m/^running/ );
if( $hash->{PID} ) { if( $hash->{PID} ) {
$hash->{start} = 1; $hash->{restart} = 1;
alexa_stopAlexaFHEM($hash); alexa_stopAlexaFHEM($hash);
return undef; return undef;
} }
delete $hash->{start}; delete $hash->{restart};
my $ssh_cmd; my $ssh_cmd;
if( my $host = AttrVal($name, 'alexaFHEM-host', undef ) ) { if( my $host = AttrVal($name, 'alexaFHEM-host', undef ) ) {
@ -584,9 +586,8 @@ alexa_startAlexaFHEM($)
close $parent; close $parent;
close $child; close $child;
my $msg = "$name: Cannot fork: $!"; Log3 $name, 1, "$name: Cannot fork: $!";
Log 1, $msg; return;
return $msg;
} }
if( $pid ) { if( $pid ) {
@ -720,6 +721,8 @@ alexa_stoppedAlexaFHEM($)
delete($hash->{FD}); delete($hash->{FD});
delete($selectlist{$name}); delete($selectlist{$name});
alexa_closeLogfile($hash) if( $hash->{log} );
Log3 $name, 3, "$name: alexaFHEM stopped"; Log3 $name, 3, "$name: alexaFHEM stopped";
$hash->{LAST_STOP} = FmtDateTime( gettimeofday() ); $hash->{LAST_STOP} = FmtDateTime( gettimeofday() );
@ -745,7 +748,7 @@ alexa_stoppedAlexaFHEM($)
delete $hash->{shutdown}; delete $hash->{shutdown};
CancelDelayedShutdown($name); CancelDelayedShutdown($name);
} elsif( $hash->{start} ) { } elsif( $hash->{restart} ) {
alexa_startAlexaFHEM($hash) alexa_startAlexaFHEM($hash)
} }
@ -1381,7 +1384,7 @@ alexa_Attr($$$)
} elsif( $attrName eq 'alexaFHEM-log' ) { } elsif( $attrName eq 'alexaFHEM-log' ) {
if( $cmd eq "set" && $attrVal && $attrVal ne 'FHEM' ) { if( $cmd eq "set" && $attrVal && $attrVal ne 'FHEM' ) {
fhem( "defmod -temporary alexaFHEMlog FileLog $attrVal fakelog" ); fhem( "defmod -temporary alexaFHEMlog FileLog $attrVal fakelog" );
CommandAttr( undef, "alexaFHEMlog room hidden" ); CommandAttr( undef, 'alexaFHEMlog room hidden' );
#if( my $room = AttrVal($name, "room", undef ) ) { #if( my $room = AttrVal($name, "room", undef ) ) {
# CommandAttr( undef,"alexaFHEMlog room $room" ); # CommandAttr( undef,"alexaFHEMlog room $room" );
#} #}