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

Sync up quotes and space differences frmo zma_to_thread

This commit is contained in:
Isaac Connor 2019-03-19 17:15:32 -04:00
parent a437c407a7
commit 7b878a4c64
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
View File

@ -1,6 +1,6 @@
# ========================================================================== ############################################################################
# #
# ZoneMinder Logger Module, $Date$, $Revision$ # ZoneMinder Logger Module
# Copyright (C) 2001-2008 Philip Coombes # Copyright (C) 2001-2008 Philip Coombes
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# ========================================================================== ############################################################################
# #
# This module contains the debug definitions and functions used by the rest # This module contains the debug definitions and functions used by the rest
# of the ZoneMinder scripts # of the ZoneMinder scripts
@ -81,11 +81,11 @@ our @EXPORT = qw();
our $VERSION = $ZoneMinder::Base::VERSION; our $VERSION = $ZoneMinder::Base::VERSION;
# ========================================================================== ############################################################################
# #
# Logger Facilities # Logger Facilities
# #
# ========================================================================== ############################################################################
require ZoneMinder::Config; require ZoneMinder::Config;

18
scripts/zmpkg.pl.in
View File

@ -84,9 +84,7 @@ if ( !$command ) {
} }
# PP - Sane state check # PP - Sane state check
Debug("StartisActiveSSantiyCheck");
isActiveSanityCheck(); isActiveSanityCheck();
Debug("Done isActiveSSantiyCheck");
# Move to the right place # Move to the right place
chdir($Config{ZM_PATH_WEB}) chdir($Config{ZM_PATH_WEB})
@ -224,9 +222,9 @@ if ( $command =~ /^(?:start|restart)$/ ) {
if ( $Config{ZM_OPT_CONTROL} ) { if ( $Config{ZM_OPT_CONTROL} ) {
if ( $monitor->{Controllable} && $monitor->{TrackMotion} ) { if ( $monitor->{Controllable} && $monitor->{TrackMotion} ) {
if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' ) { if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' ) {
runCommand( "zmdc.pl start zmtrack.pl -m $monitor->{Id}" ); runCommand("zmdc.pl start zmtrack.pl -m $monitor->{Id}");
} else { } else {
Warning(' Monitor is set to track motion, but does not have motion detection enabled.'); Warning('Monitor is set to track motion, but does not have motion detection enabled.');
} # end if Has motion enabled } # end if Has motion enabled
} # end if track motion } # end if track motion
} # end if ZM_OPT_CONTROL } # end if ZM_OPT_CONTROL
@ -253,15 +251,15 @@ if ( $command =~ /^(?:start|restart)$/ ) {
} }
if ( $Config{ZM_RUN_AUDIT} ) { if ( $Config{ZM_RUN_AUDIT} ) {
if ( $Server and exists $$Server{'zmaudit'} and ! $$Server{'zmaudit'} ) { if ( $Server and exists $$Server{zmaudit} and ! $$Server{zmaudit} ) {
Debug("Not running zmaudit.pl because it is turned off for this server."); Debug('Not running zmaudit.pl because it is turned off for this server.');
} else { } else {
runCommand('zmdc.pl start zmaudit.pl -c'); runCommand('zmdc.pl start zmaudit.pl -c');
} }
} }
if ( $Config{ZM_OPT_TRIGGERS} ) { if ( $Config{ZM_OPT_TRIGGERS} ) {
if ( $Server and exists $$Server{'zmtrigger'} and ! $$Server{'zmtrigger'} ) { if ( $Server and exists $$Server{zmtrigger} and ! $$Server{zmtrigger} ) {
Debug("Not running zmtrigger.pl because it is turned off for this server."); Debug('Not running zmtrigger.pl because it is turned off for this server.');
} else { } else {
runCommand('zmdc.pl start zmtrigger.pl'); runCommand('zmdc.pl start zmtrigger.pl');
} }
@ -283,8 +281,8 @@ if ( $command =~ /^(?:start|restart)$/ ) {
runCommand('zmdc.pl start zmeventnotification.pl'); runCommand('zmdc.pl start zmeventnotification.pl');
} }
} }
if ( $Server and exists $$Server{'zmstats'} and ! $$Server{'zmstats'} ) { if ( $Server and exists $$Server{zmstats} and ! $$Server{zmstats} ) {
Debug("Not running zmstats.pl because it is turned off for this server."); Debug('Not running zmstats.pl because it is turned off for this server.');
} else { } else {
runCommand('zmdc.pl start zmstats.pl'); runCommand('zmdc.pl start zmstats.pl');
} }