diff --git a/src/zm_event.cpp b/src/zm_event.cpp index 8fbbd6e9e..18517e4be 100644 --- a/src/zm_event.cpp +++ b/src/zm_event.cpp @@ -144,13 +144,13 @@ bool Event::OpenFrameSocket( int monitor_id ) if ( connect( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 ) { - Warning(( "Can't connect: %s", strerror(errno) )); + Warning(( "Can't connect to frame server: %s", strerror(errno) )); close( sd ); sd = -1; return( false ); } - Info(( "Opened connection to frame server" )); + Debug( 1, ( "Opened connection to frame server" )); return( true ); } @@ -331,7 +331,7 @@ void Event::AddFrame( Image *image, struct timeval timestamp, int score, Image * } else { - Info(( "Can't glob '%s': %d", diag_glob, glob_status )); + Debug( 1, ( "Can't glob '%s': %d", diag_glob, glob_status )); } } else diff --git a/src/zm_image.cpp b/src/zm_image.cpp index d6273ebb2..01c96cb73 100644 --- a/src/zm_image.cpp +++ b/src/zm_image.cpp @@ -70,7 +70,7 @@ Image::BlendTablePtr Image::GetBlendTable( int transparency ) if ( !blend_ptr ) { blend_ptr = blend_tables[transparency] = new BlendTable[1]; - Info(( "Generating blend table for transparency %d", transparency )); + //Info(( "Generating blend table for transparency %d", transparency )); int opacity = 100-transparency; //int round_up = 50/transparency; for ( int i = 0; i < 256; i++ ) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index b8bfc8b3e..912d6abff 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -195,10 +195,10 @@ void Monitor::Setup() last_alarm_count = 0; state = IDLE; - Info(( "monitor purpose=%d", purpose )); + Debug( 1, ( "monitor purpose=%d", purpose )); int shared_data_size = sizeof(SharedData)+(image_buffer_count*sizeof(time_t))+(image_buffer_count*camera->ImageSize()); - Info(( "shm.size=%d", shared_data_size )); + Debug( 1, ( "shm.size=%d", shared_data_size )); shmid = shmget( (int)config.Item( ZM_SHM_KEY )|id, shared_data_size, IPC_CREAT|0700 ); if ( shmid < 0 ) { @@ -253,9 +253,9 @@ void Monitor::Setup() event = 0; - Info(( "Monitor %s has function %d", name, function )); - Info(( "Monitor %s LBF = '%s', LBX = %d, LBY = %d", name, label_format, label_coord.X(), label_coord.Y() )); - Info(( "Monitor %s IBC = %d, WUC = %d, pEC = %d, PEC = %d, FRI = %d, RBP = %d", name, image_buffer_count, warmup_count, pre_event_count, post_event_count, fps_report_interval, ref_blend_perc )); + Debug( 1, ( "Monitor %s has function %d", name, function )); + Debug( 1, ( "Monitor %s LBF = '%s', LBX = %d, LBY = %d", name, label_format, label_coord.X(), label_coord.Y() )); + Debug( 1, ( "Monitor %s IBC = %d, WUC = %d, pEC = %d, PEC = %d, FRI = %d, RBP = %d", name, image_buffer_count, warmup_count, pre_event_count, post_event_count, fps_report_interval, ref_blend_perc )); if ( purpose == ANALYSIS ) { @@ -337,9 +337,6 @@ struct timeval Monitor::GetTimestamp( int index ) const index = shared_data->last_write_index; } - Info(( "Index %d = %p", index, (void *) image_buffer[index].timestamp )); - Info(( "Timestamp %ld.%ld", image_buffer[index].timestamp->tv_sec, image_buffer[index].timestamp->tv_usec )); - Snapshot *snap = &image_buffer[index]; return( *(snap->timestamp) ); } @@ -832,7 +829,7 @@ bool Monitor::Analyse() void Monitor::ReloadZones() { - Info(( "Reloading zones for monitor %s", name )); + Debug( 1, ( "Reloading zones for monitor %s", name )); for( int i = 0; i < n_zones; i++ ) { delete zones[i]; @@ -866,7 +863,7 @@ int Monitor::Load( int device, Monitor **&monitors, Purpose purpose ) exit( mysql_errno( &dbconn ) ); } int n_monitors = mysql_num_rows( result ); - Info(( "Got %d monitors", n_monitors )); + Debug( 1, ( "Got %d monitors", n_monitors )); delete[] monitors; monitors = new Monitor *[n_monitors]; for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) @@ -898,7 +895,7 @@ int Monitor::Load( int device, Monitor **&monitors, Purpose purpose ) Zone **zones = 0; int n_zones = Zone::Load( monitors[i], zones ); monitors[i]->AddZones( n_zones, zones ); - Info(( "Loaded monitor %d(%s), %d zones", atoi(dbrow[0]), dbrow[1], n_zones )); + Debug( 1, ( "Loaded monitor %d(%s), %d zones", atoi(dbrow[0]), dbrow[1], n_zones )); } if ( mysql_errno( &dbconn ) ) { @@ -935,7 +932,7 @@ int Monitor::Load( const char *host, const char*port, const char *path, Monitor exit( mysql_errno( &dbconn ) ); } int n_monitors = mysql_num_rows( result ); - Info(( "Got %d monitors", n_monitors )); + Debug( 1, ( "Got %d monitors", n_monitors )); delete[] monitors; monitors = new Monitor *[n_monitors]; for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) @@ -967,7 +964,7 @@ int Monitor::Load( const char *host, const char*port, const char *path, Monitor Zone **zones = 0; int n_zones = Zone::Load( monitors[i], zones ); monitors[i]->AddZones( n_zones, zones ); - Info(( "Loaded monitor %d(%s), %d zones", atoi(dbrow[0]), dbrow[1], n_zones )); + Debug( 1, ( "Loaded monitor %d(%s), %d zones", atoi(dbrow[0]), dbrow[1], n_zones )); } if ( mysql_errno( &dbconn ) ) { @@ -997,7 +994,7 @@ Monitor *Monitor::Load( int id, bool load_zones, Purpose purpose ) exit( mysql_errno( &dbconn ) ); } int n_monitors = mysql_num_rows( result ); - Info(( "Got %d monitors", n_monitors )); + Debug( 1, ( "Got %d monitors", n_monitors )); Monitor *monitor = 0; for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) { @@ -1062,7 +1059,7 @@ Monitor *Monitor::Load( int id, bool load_zones, Purpose purpose ) n_zones = Zone::Load( monitor, zones ); monitor->AddZones( n_zones, zones ); } - Info(( "Loaded monitor %d(%s), %d zones", atoi(dbrow[0]), dbrow[1], n_zones )); + Debug( 1, ( "Loaded monitor %d(%s), %d zones", atoi(dbrow[0]), dbrow[1], n_zones )); } if ( mysql_errno( &dbconn ) ) { diff --git a/src/zm_remote_camera.cpp b/src/zm_remote_camera.cpp index 2c2096646..07311d2b7 100644 --- a/src/zm_remote_camera.cpp +++ b/src/zm_remote_camera.cpp @@ -146,7 +146,7 @@ int RemoteCamera::Connect() if ( connect( sd, (struct sockaddr *)&sa, sizeof(sa) ) < 0 ) { - Error(( "Can't connect: %s", strerror(errno) )); + Error(( "Can't connect to remote camera: %s", strerror(errno) )); return( -1 ); } } diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp index ab53a50f7..159b99e42 100644 --- a/src/zm_zone.cpp +++ b/src/zm_zone.cpp @@ -52,7 +52,7 @@ void Zone::Setup( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_ min_blobs = p_min_blobs; max_blobs = p_max_blobs; - Info(( "Initialised zone %d/%s - %d - %dx%d - Rgb:%06x, CM:%d, MnAT:%d, MxAT:%d, MnAP:%d, MxAP:%d, FB:%dx%d, MnFP:%d, MxFP:%d, MnBS:%d, MxBS:%d, MnB:%d, MxB:%d", id, label, type, limits.Width(), limits.Height(), alarm_rgb, check_method, min_pixel_threshold, max_pixel_threshold, min_alarm_pixels, max_alarm_pixels, filter_box.X(), filter_box.Y(), min_filter_pixels, max_filter_pixels, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs )); + Debug( 1, ( "Initialised zone %d/%s - %d - %dx%d - Rgb:%06x, CM:%d, MnAT:%d, MxAT:%d, MnAP:%d, MxAP:%d, FB:%dx%d, MnFP:%d, MxFP:%d, MnBS:%d, MxBS:%d, MnB:%d, MxB:%d", id, label, type, limits.Width(), limits.Height(), alarm_rgb, check_method, min_pixel_threshold, max_pixel_threshold, min_alarm_pixels, max_alarm_pixels, filter_box.X(), filter_box.Y(), min_filter_pixels, max_filter_pixels, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs )); alarmed = false; alarm_pixels = 0; @@ -463,7 +463,7 @@ int Zone::Load( Monitor *monitor, Zone **&zones ) exit( mysql_errno( &dbconn ) ); } int n_zones = mysql_num_rows( result ); - Info(( "Got %d zones for monitor %s", n_zones, monitor->Name() )); + Debug( 1, ( "Got %d zones for monitor %s", n_zones, monitor->Name() )); delete[] zones; zones = new Zone *[n_zones]; for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) diff --git a/src/zma.cpp b/src/zma.cpp index a4d566a18..bb7dac9e7 100644 --- a/src/zma.cpp +++ b/src/zma.cpp @@ -32,10 +32,10 @@ void zm_die_handler( int signal ) char * errorString =(char *) malloc(errorStringSize + 1); // plus 1 for termination char. (void) snprintf(errorString, errorStringSize, "Got signal (%s), crashing.", error); - Info(( (const char *)errorString )); + Error(( (const char *)errorString )); free(errorString); #else /* HAVE_DECL_STRSIGNAL */ - Info(( "Got signal %d, crashing", signal )); + Error(( "Got signal %d, crashing", signal )); #endif /* HAVE_DECL_STRSIGNAL */ exit( signal ); } diff --git a/src/zmfix.cpp b/src/zmfix.cpp index 41efd3a4a..a7a567e4d 100644 --- a/src/zmfix.cpp +++ b/src/zmfix.cpp @@ -68,7 +68,7 @@ bool fixDevice( int device ) mode_t mode = stat_buf.st_mode; if ( (mode & mask) == mask ) { - Info(( "Permissions on %s are ok at %o", device_path, mode )); + Debug( 1, ( "Permissions on %s are ok at %o", device_path, mode )); return( true ); } mode |= mask;