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

Fixed issue with event section lengths being ignored on alarm and rationalised debug. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2778 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2009-02-18 22:05:32 +00:00
parent 28692c1b28
commit ee972ac78a
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/zm_monitor.cpp
View File

@ -512,6 +512,8 @@ Monitor::Monitor(
Monitor::~Monitor() Monitor::~Monitor()
{ {
if ( event )
Info( "%s: %03d - Closing event %d, shutting down", name, image_count, event->Id() );
closeEvent(); closeEvent();
for ( int i = 0; i < image_buffer_count; i++ ) for ( int i = 0; i < image_buffer_count; i++ )
@ -1163,6 +1165,7 @@ bool Monitor::Analyse()
Warning( "%s: %s", SIGNAL_CAUSE, signalText ); Warning( "%s: %s", SIGNAL_CAUSE, signalText );
if ( event ) if ( event )
{ {
Info( "%s: %03d - Closing event %d, signal loss", name, image_count, event->Id() );
closeEvent(); closeEvent();
shared_data->state = state = IDLE; shared_data->state = state = IDLE;
last_section_mod = 0; last_section_mod = 0;
@ -1242,13 +1245,9 @@ bool Monitor::Analyse()
if ( state == IDLE || state == TAPE || event_close_mode == CLOSE_TIME ) if ( state == IDLE || state == TAPE || event_close_mode == CLOSE_TIME )
{ {
if ( state == IDLE || state == TAPE ) if ( state == IDLE || state == TAPE )
{ Info( "%s: %03d - Closing event %d, section end", name, image_count, event->Id() )
Info( "%s: %03d - Ending event %d", name, image_count, event->Id() );
}
else else
{ Info( "%s: %03d - Closing event %d, section end forced ", name, image_count, event->Id() );
Info( "%s: %03d - Force closing event %d", name, image_count, event->Id() );
}
closeEvent(); closeEvent();
last_section_mod = 0; last_section_mod = 0;
} }
@ -1266,7 +1265,7 @@ bool Monitor::Analyse()
event = new Event( this, *timestamp, "Continuous", noteSetMap ); event = new Event( this, *timestamp, "Continuous", noteSetMap );
shared_data->last_event = event->Id(); shared_data->last_event = event->Id();
Info( "%s: %03d - Starting new event %d", name, image_count, event->Id() ); Info( "%s: %03d - Opening new event %d, section start", name, image_count, event->Id() );
//if ( config.overlap_timed_events ) //if ( config.overlap_timed_events )
if ( false ) if ( false )
@ -1302,7 +1301,7 @@ bool Monitor::Analyse()
event = new Event( this, *(image_buffer[pre_index].timestamp), cause, noteSetMap ); event = new Event( this, *(image_buffer[pre_index].timestamp), cause, noteSetMap );
shared_data->last_event = event->Id(); shared_data->last_event = event->Id();
Info( "%s: %03d - Creating new event %d", name, image_count, event->Id() ); Info( "%s: %03d - Opening new event %d, alarm start", name, image_count, event->Id() );
for ( int i = 0; i < pre_event_count; i++ ) for ( int i = 0; i < pre_event_count; i++ )
{ {
@ -1343,11 +1342,11 @@ bool Monitor::Analyse()
if ( image_count-last_alarm_count > post_event_count ) if ( image_count-last_alarm_count > post_event_count )
{ {
Info( "%s: %03d - Left alarm state (%d) - %d(%d) images", name, image_count, event->Id(), event->Frames(), event->AlarmFrames() ); Info( "%s: %03d - Left alarm state (%d) - %d(%d) images", name, image_count, event->Id(), event->Frames(), event->AlarmFrames() );
if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() != "Signal" ) if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == "Signal" )
{ {
shared_data->state = state = IDLE; shared_data->state = state = IDLE;
delete event; Info( "%s: %03d - Closing event %d, alarm end%s", name, image_count, event->Id(), (function==MOCORD)?", section truncated":"" );
event = 0; closeEvent();
} }
else else
{ {
@ -1455,7 +1454,7 @@ bool Monitor::Analyse()
int section_mod = timestamp->tv_sec%section_length; int section_mod = timestamp->tv_sec%section_length;
if ( section_mod < last_section_mod ) if ( section_mod < last_section_mod )
{ {
Info( "%s: %03d - Ending event %d", name, image_count, event->Id() ); Info( "%s: %03d - Closing event %d, section end2", name, image_count, event->Id() );
closeEvent(); closeEvent();
last_section_mod = 0; last_section_mod = 0;
} }
@ -1471,7 +1470,7 @@ bool Monitor::Analyse()
{ {
if ( event ) if ( event )
{ {
Info( "%s: %03d - Closing event %d", name, image_count, event->Id() ); Info( "%s: %03d - Closing event %d, trigger off", name, image_count, event->Id() );
closeEvent(); closeEvent();
} }
shared_data->state = state = IDLE; shared_data->state = state = IDLE;
@ -1496,6 +1495,9 @@ void Monitor::Reload()
{ {
Debug( 1, "Reloading monitor %s", name ); Debug( 1, "Reloading monitor %s", name );
if ( event )
Info( "%s: %03d - Closing event %d, reloading", name, image_count, event->Id() );
closeEvent(); closeEvent();
static char sql[BUFSIZ]; static char sql[BUFSIZ];