ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't exit after 30 minutes. Google code style.

This commit is contained in:
Isaac Connor 2020-11-21 15:08:09 -05:00
parent 6da673dd69
commit b44f14691e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/zmcontrol.pl.in
View File

@ -162,24 +162,24 @@ if ( $options{command} ) {
listen(SERVER, SOMAXCONN) or Fatal("Can't listen: $!");
my $rin = '';
vec( $rin, fileno(SERVER), 1 ) = 1;
vec($rin, fileno(SERVER), 1) = 1;
my $win = $rin;
my $ein = $win;
my $timeout = MAX_COMMAND_WAIT;
while( 1 ) {
while ( 1 ) {
my $nfound = select(my $rout = $rin, undef, undef, $timeout);
if ( $nfound > 0 ) {
if ( vec( $rout, fileno(SERVER), 1 ) ) {
if ( vec($rout, fileno(SERVER), 1) ) {
my $paddr = accept(CLIENT, SERVER);
my $message = <CLIENT>;
close(CLIENT);
next if !$message;
my $params = jsonDecode($message);
Debug( Dumper( $params ) );
Debug(Dumper($params));
my $command = $params->{command};
close(CLIENT);
if ( $command eq 'quit' ) {
last;
} elsif ( $command ) {
@ -192,7 +192,7 @@ if ( $options{command} ) {
}
} elsif ( $nfound < 0 ) {
if ( $! == EINTR ) {
# Likely just SIGHUP
# Likely just SIGHUP
Debug("Can't select: $!");
} elsif ( $! == EPIPE ) {
Error("Can't select: $!");
@ -200,17 +200,14 @@ if ( $options{command} ) {
Fatal("Can't select: $!");
}
} else {
#print( "Select timed out\n" );
last;
Debug('Select timed out');
}
} # end while forever
Info("Control server $id/$protocol exiting");
unlink($sock_file);
$control->close();
exit(0);
} # end if !server up
exit(0);
1;