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

scripts/zmaudit.pl.in

@@ -409,21 +409,22 @@ MAIN: while( $loop ) {
 
       if ( ! $$Storage{Scheme} ) {
         Error("Storage Scheme not set on $$Storage{Name}");
-        if ( ! chdir( $monitor_dir ) ) {
-          Error( "Can't chdir directory '$$Storage{Path}/$monitor_dir': $!" );
+        if ( ! chdir($monitor_dir) ) {
+          Error("Can't chdir directory '$$Storage{Path}/$monitor_dir': $!");
           next;
         }
-        if ( ! opendir( DIR, "." ) ) {
-          Error( "Can't open directory '$$Storage{Path}/$monitor_dir': $!" );
+        if ( ! opendir(DIR, '.') ) {
+          Error("Can't open directory '$$Storage{Path}/$monitor_dir': $!");
           next;
         }
-        my @temp_events = sort { $b <=> $a } grep { -d $_ && $_ =~ /^\d+$/ } readdir( DIR );
-        closedir( DIR );
+        my @temp_events = sort { $b <=> $a } grep { -d $_ && $_ =~ /^\d+$/ } readdir(DIR);
+        closedir(DIR);
         my $count = 0;
         foreach my $event ( @temp_events ) {
           my $Event = $fs_events->{$event} = new ZoneMinder::Event();
           $$Event{Id} = $event;
           #$$Event{Path} = $event_path;
+          $$Event{Scheme} = 'Shallow';
           $Event->MonitorId( $monitor_dir );
           $Event->StorageId( $Storage->Id() );
         } # end foreach event
@@ -570,7 +571,7 @@ MAIN: while( $loop ) {
           Debug("Database event $$Event{Id} apparently exists at " . $Event->Path() );
         } else {
           if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
-            aud_print( "Database event '$db_monitor/$db_event' does not exist at " . $Event->Path().' in filesystem, deleting' );
+            aud_print("Database event '$db_monitor/$db_event' does not exist at " . $Event->Path().' in filesystem, deleting');
             if ( confirm() ) {
               $Event->delete();
               $cleaned = 1;
@@ -580,7 +581,7 @@ MAIN: while( $loop ) {
           }
         } # end if exists in filesystem
       } else {
-        Debug("Found fs event for $db_event, $age at " . $$fs_events{$db_event}->Path());
+        Debug("Found fs event for id $db_event, $age seconds old at " . $$fs_events{$db_event}->Path());
         my $Event = new ZoneMinder::Event( $db_event );
         if ( ! $Event->check_for_in_filesystem() ) {
           Warning("Not found at " . $Event->Path() . ' was found at ' . $$fs_events{$db_event}->Path() );

src/zm.h

@@ -17,9 +17,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#if !defined(PATH_MAX)
-#define PATH_MAX 1024
-#endif
 
 #ifndef ZM_H
 #define ZM_H

src/zm_comms.h

@@ -20,6 +20,7 @@
 #ifndef ZM_COMMS_H
 #define ZM_COMMS_H
 
+#include "zm_logger.h"
 #include "zm_exception.h"
 
 #include <string.h>

src/zm_config.h.in

@@ -20,9 +20,11 @@
 #ifndef ZM_CONFIG_H
 #define ZM_CONFIG_H
 
+#if !defined(PATH_MAX)
+#define PATH_MAX 1024
+#endif
 #include "config.h"
 #include "zm_config_defines.h"
-#include "zm.h"
 
 #include <string>
 

src/zm_exception.h

@@ -20,8 +20,6 @@
 #ifndef ZM_EXCEPTION_H
 #define ZM_EXCEPTION_H
 
-#include "zm.h"
-
 #include <string>
 
 class Exception

src/zm_ffmpeg.cpp

@@ -43,16 +43,23 @@ void log_libav_callback( void *ptr, int level, const char *fmt, va_list vargs )
     log_level = Logger::DEBUG1;
   } else if ( level == AV_LOG_DEBUG ) { //48
     log_level = Logger::DEBUG2;
+#ifdef AV_LOG_TRACE
   } else if ( level == AV_LOG_TRACE ) {
     log_level = Logger::DEBUG8;
+#endif
+#ifdef AV_LOG_MAX_OFFSET
   } else if ( level == AV_LOG_MAX_OFFSET ) {
     log_level = Logger::DEBUG9;
+#endif
   } else {
     Error("Unknown log level %d", level);
   }
 
   if ( log ) {
-    log->logPrint(false, __FILE__, __LINE__, log_level, fmt, vargs);
+    char            logString[8192];
+    vsnprintf(logString, sizeof(logString)-1, fmt, vargs);
+
+    log->logPrint(false, __FILE__, __LINE__, log_level, logString);
   }
 }
 

src/zm_logger.cpp

@@ -444,6 +444,7 @@ void Logger::closeSyslog() {
 void Logger::logPrint( bool hex, const char * const filepath, const int line, const int level, const char *fstring, ... ) {
   if ( level > mEffectiveLevel ) 
     return;
+  log_mutex.lock();
   char            timeString[64];
   char            logString[8192];
   va_list         argPtr;
@@ -579,6 +580,7 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
       abort();
     exit(-1);
   }
+  log_mutex.unlock();
 }
 
 

src/zm_logger.h

@@ -30,6 +30,8 @@
 #endif // HAVE_SYS_SYSCALL_H
 #include <mysql/mysql.h>
 
+#include "zm_thread.h"
+
 class Logger {
 public:
   enum { 
@@ -82,6 +84,8 @@ private:
   static bool smInitialised;
   static Logger *smInstance;
 
+  RecursiveMutex log_mutex;
+
   static StringMap smCodes;
   static IntMap smSyslogPriorities;
 

src/zm_thread.h

@@ -20,9 +20,12 @@
 #ifndef ZM_THREAD_H
 #define ZM_THREAD_H
 
+class RecursiveMutex;
+
+
+#include "zm_config.h"
 #include <unistd.h>
 #include <pthread.h>
-#include <unistd.h>
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif // HAVE_SYS_SYSCALL_H