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

Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2016-01-04 15:17:43 -05:00
parent 75f6da3526 6e685ec8c8
commit 1819f8ecad
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distros/ubuntu1410/changelog
View File

@ -1,3 +1,9 @@
zoneminder (1.29.111-trusty-2016010401) trusty; urgency=medium
* include fix to rotate image dimensions when applying a rotation
-- Isaac Connor <iconnor@testing.internal.point-one.com> Mon, 04 Jan 2016 13:24:42 -0500
zoneminder (1.29.111-trusty-2016010101) trusty; urgency=medium zoneminder (1.29.111-trusty-2016010101) trusty; urgency=medium
* fix logging with multi-server * fix logging with multi-server

5
scripts/zmaudit.pl.in
View File

@ -114,6 +114,7 @@ if ( ($report + $interactive + $continuous) > 1 )
my $dbh = zmDbConnect(); my $dbh = zmDbConnect();
require ZoneMinder::Monitor;
require ZoneMinder::Storage; require ZoneMinder::Storage;
require ZoneMinder::Event; require ZoneMinder::Event;
@ -364,7 +365,9 @@ MAIN: while( $loop ) {
} }
else else
{ {
aud_print( "Database monitor '$db_monitor' does not exist in filesystem" ); my $Monitor = new ZoneMinder::Monitor( $db_monitor );
my $Storage = $Monitor->Storage();
aud_print( "Database monitor '$db_monitor' does not exist in filesystem, should have been at ".$Storage->Path()."\n" );
#if ( confirm() ) #if ( confirm() )
#{ #{
# We don't actually do this in case it's new # We don't actually do this in case it's new