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

Changed extraneous Info messages to be Error, Debug or removed. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@975 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2004-03-17 10:28:07 +00:00
parent eb8c334e30
commit 4dfdf8f00b
7 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_event.cpp
View File

@ -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 ) 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 ); close( sd );
sd = -1; sd = -1;
return( false ); return( false );
} }
Info(( "Opened connection to frame server" )); Debug( 1, ( "Opened connection to frame server" ));
return( true ); return( true );
} }
@ -331,7 +331,7 @@ void Event::AddFrame( Image *image, struct timeval timestamp, int score, Image *
} }
else else
{ {
Info(( "Can't glob '%s': %d", diag_glob, glob_status )); Debug( 1, ( "Can't glob '%s': %d", diag_glob, glob_status ));
} }
} }
else else

2
src/zm_image.cpp
View File

@ -70,7 +70,7 @@ Image::BlendTablePtr Image::GetBlendTable( int transparency )
if ( !blend_ptr ) if ( !blend_ptr )
{ {
blend_ptr = blend_tables[transparency] = new BlendTable[1]; 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 opacity = 100-transparency;
//int round_up = 50/transparency; //int round_up = 50/transparency;
for ( int i = 0; i < 256; i++ ) for ( int i = 0; i < 256; i++ )

27
src/zm_monitor.cpp
View File

@ -195,10 +195,10 @@ void Monitor::Setup()
last_alarm_count = 0; last_alarm_count = 0;
state = IDLE; 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()); 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 ); shmid = shmget( (int)config.Item( ZM_SHM_KEY )|id, shared_data_size, IPC_CREAT|0700 );
if ( shmid < 0 ) if ( shmid < 0 )
{ {
@ -253,9 +253,9 @@ void Monitor::Setup()
event = 0; event = 0;
Info(( "Monitor %s has function %d", name, function )); Debug( 1, ( "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() )); Debug( 1, ( "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 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 ) if ( purpose == ANALYSIS )
{ {
@ -337,9 +337,6 @@ struct timeval Monitor::GetTimestamp( int index ) const
index = shared_data->last_write_index; 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]; Snapshot *snap = &image_buffer[index];
return( *(snap->timestamp) ); return( *(snap->timestamp) );
} }
@ -832,7 +829,7 @@ bool Monitor::Analyse()
void Monitor::ReloadZones() 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++ ) for( int i = 0; i < n_zones; i++ )
{ {
delete zones[i]; delete zones[i];
@ -866,7 +863,7 @@ int Monitor::Load( int device, Monitor **&monitors, Purpose purpose )
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
int n_monitors = mysql_num_rows( result ); int n_monitors = mysql_num_rows( result );
Info(( "Got %d monitors", n_monitors )); Debug( 1, ( "Got %d monitors", n_monitors ));
delete[] monitors; delete[] monitors;
monitors = new Monitor *[n_monitors]; monitors = new Monitor *[n_monitors];
for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) 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; Zone **zones = 0;
int n_zones = Zone::Load( monitors[i], zones ); int n_zones = Zone::Load( monitors[i], zones );
monitors[i]->AddZones( n_zones, 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 ) ) 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 ) ); exit( mysql_errno( &dbconn ) );
} }
int n_monitors = mysql_num_rows( result ); int n_monitors = mysql_num_rows( result );
Info(( "Got %d monitors", n_monitors )); Debug( 1, ( "Got %d monitors", n_monitors ));
delete[] monitors; delete[] monitors;
monitors = new Monitor *[n_monitors]; monitors = new Monitor *[n_monitors];
for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) 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; Zone **zones = 0;
int n_zones = Zone::Load( monitors[i], zones ); int n_zones = Zone::Load( monitors[i], zones );
monitors[i]->AddZones( n_zones, 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 ) ) if ( mysql_errno( &dbconn ) )
{ {
@ -997,7 +994,7 @@ Monitor *Monitor::Load( int id, bool load_zones, Purpose purpose )
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
int n_monitors = mysql_num_rows( result ); int n_monitors = mysql_num_rows( result );
Info(( "Got %d monitors", n_monitors )); Debug( 1, ( "Got %d monitors", n_monitors ));
Monitor *monitor = 0; Monitor *monitor = 0;
for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) 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 ); n_zones = Zone::Load( monitor, zones );
monitor->AddZones( n_zones, 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 ) ) if ( mysql_errno( &dbconn ) )
{ {

2
src/zm_remote_camera.cpp
View File

@ -146,7 +146,7 @@ int RemoteCamera::Connect()
if ( connect( sd, (struct sockaddr *)&sa, sizeof(sa) ) < 0 ) 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 ); return( -1 );
} }
} }

4
src/zm_zone.cpp
View File

@ -52,7 +52,7 @@ void Zone::Setup( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_
min_blobs = p_min_blobs; min_blobs = p_min_blobs;
max_blobs = p_max_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; alarmed = false;
alarm_pixels = 0; alarm_pixels = 0;
@ -463,7 +463,7 @@ int Zone::Load( Monitor *monitor, Zone **&zones )
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
int n_zones = mysql_num_rows( result ); 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; delete[] zones;
zones = new Zone *[n_zones]; zones = new Zone *[n_zones];
for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )

4
src/zma.cpp
View File

@ -32,10 +32,10 @@ void zm_die_handler( int signal )
char * errorString =(char *) malloc(errorStringSize + 1); // plus 1 for termination char. char * errorString =(char *) malloc(errorStringSize + 1); // plus 1 for termination char.
(void) snprintf(errorString, errorStringSize, "Got signal (%s), crashing.", error); (void) snprintf(errorString, errorStringSize, "Got signal (%s), crashing.", error);
Info(( (const char *)errorString )); Error(( (const char *)errorString ));
free(errorString); free(errorString);
#else /* HAVE_DECL_STRSIGNAL */ #else /* HAVE_DECL_STRSIGNAL */
Info(( "Got signal %d, crashing", signal )); Error(( "Got signal %d, crashing", signal ));
#endif /* HAVE_DECL_STRSIGNAL */ #endif /* HAVE_DECL_STRSIGNAL */
exit( signal ); exit( signal );
} }

2
src/zmfix.cpp
View File

@ -68,7 +68,7 @@ bool fixDevice( int device )
mode_t mode = stat_buf.st_mode; mode_t mode = stat_buf.st_mode;
if ( (mode & mask) == mask ) 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 ); return( true );
} }
mode |= mask; mode |= mask;