lots more debugging. re-add status update command on failure
This commit is contained in:
parent
d35edf29c6
commit
cd1d2e1721
|
@ -195,6 +195,7 @@ CREATE TABLE `Events` (
|
||||||
`Frames` int(10) unsigned default NULL,
|
`Frames` int(10) unsigned default NULL,
|
||||||
`AlarmFrames` int(10) unsigned default NULL,
|
`AlarmFrames` int(10) unsigned default NULL,
|
||||||
`DefaultVideo` VARCHAR( 64 ) DEFAULT '' NOT NULL,
|
`DefaultVideo` VARCHAR( 64 ) DEFAULT '' NOT NULL,
|
||||||
|
`SaveJPEGs` TINYINT,
|
||||||
`TotScore` int(10) unsigned NOT NULL default '0',
|
`TotScore` int(10) unsigned NOT NULL default '0',
|
||||||
`AvgScore` smallint(5) unsigned default '0',
|
`AvgScore` smallint(5) unsigned default '0',
|
||||||
`MaxScore` smallint(5) unsigned default '0',
|
`MaxScore` smallint(5) unsigned default '0',
|
||||||
|
@ -384,6 +385,8 @@ CREATE TABLE `Monitors` (
|
||||||
`Deinterlacing` int(10) unsigned NOT NULL default '0',
|
`Deinterlacing` int(10) unsigned NOT NULL default '0',
|
||||||
`SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
|
`SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
|
||||||
`VideoWriter` TINYINT NOT NULL DEFAULT '0',
|
`VideoWriter` TINYINT NOT NULL DEFAULT '0',
|
||||||
|
`OutputCodec` enum('h264','mjpeg','mpeg1','mpeg2'),
|
||||||
|
`OutputContainer` enum('auto','mp4','mkv'),
|
||||||
`EncoderParameters` TEXT,
|
`EncoderParameters` TEXT,
|
||||||
`RecordAudio` TINYINT NOT NULL DEFAULT '0',
|
`RecordAudio` TINYINT NOT NULL DEFAULT '0',
|
||||||
`RTSPDescribe` tinyint(1) unsigned,
|
`RTSPDescribe` tinyint(1) unsigned,
|
||||||
|
@ -606,13 +609,14 @@ CREATE TABLE `Storage` (
|
||||||
`Path` varchar(64) NOT NULL default '',
|
`Path` varchar(64) NOT NULL default '',
|
||||||
`Name` varchar(64) NOT NULL default '',
|
`Name` varchar(64) NOT NULL default '',
|
||||||
`Type` enum('local','s3fs') NOT NULL default 'local',
|
`Type` enum('local','s3fs') NOT NULL default 'local',
|
||||||
|
`DiskSpace` bigint unsigned default NULL,
|
||||||
PRIMARY KEY (`Id`)
|
PRIMARY KEY (`Id`)
|
||||||
) ENGINE=@ZM_MYSQL_ENGINE@;
|
) ENGINE=@ZM_MYSQL_ENGINE@;
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Create a default storage location
|
-- Create a default storage location
|
||||||
--
|
--
|
||||||
insert into Storage VALUES (NULL, '/var/cache/zoneminder/events', 'Default', 'local' );
|
insert into Storage VALUES (NULL, '/var/cache/zoneminder/events', 'Default', 'local', NULL );
|
||||||
|
|
||||||
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
||||||
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
||||||
|
|
|
@ -67,3 +67,4 @@ SET @s = (SELECT IF(
|
||||||
|
|
||||||
PREPARE stmt FROM @s;
|
PREPARE stmt FROM @s;
|
||||||
EXECUTE stmt;
|
EXECUTE stmt;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
ALTER TABLE `Monitors` MODIFY `OutputCodec` enum('h264','mjpeg','mpeg1','mpeg2') default 'h264';
|
||||||
|
ALTER TABLE `Monitors` MODIFY `OutputContainer` enum('auto','mp4','mkv') default 'auto';
|
||||||
|
|
||||||
|
SET @s = (SELECT IF(
|
||||||
|
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
|
||||||
|
AND table_name = 'Events'
|
||||||
|
AND column_name = 'SaveJPEGs'
|
||||||
|
) > 0,
|
||||||
|
"SELECT 'Column SaveJPEGs already exists in Events'",
|
||||||
|
"ALTER TABLE `Events` ADD `SaveJPEGs` TINYINT AFTER `DefaultVideo`"
|
||||||
|
));
|
||||||
|
|
||||||
|
PREPARE stmt FROM @s;
|
||||||
|
EXECUTE stmt;
|
||||||
|
|
||||||
|
SET @s = (SELECT IF(
|
||||||
|
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
|
||||||
|
AND table_name = 'Storage'
|
||||||
|
AND column_name = 'DiskSpace'
|
||||||
|
) > 0,
|
||||||
|
"SELECT 'Column DiskSpace already exists in Events'",
|
||||||
|
"ALTER TABLE `Storage` ADD `DiskSpace` bigint unsigned default NULL AFTER `Type`"
|
||||||
|
));
|
||||||
|
|
||||||
|
PREPARE stmt FROM @s;
|
||||||
|
EXECUTE stmt;
|
|
@ -53,7 +53,7 @@ use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
|
||||||
? $Config{ZM_DIR_EVENTS}
|
? $Config{ZM_DIR_EVENTS}
|
||||||
: ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS})
|
: ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS})
|
||||||
;
|
;
|
||||||
use constant ZM_AUDIT_PID => $Config{ZM_RUNDIR}.'/zm.pid'
|
use constant ZM_AUDIT_PID => '@ZM_RUNDIR@/zmaudit.pid';
|
||||||
|
|
||||||
$| = 1;
|
$| = 1;
|
||||||
|
|
||||||
|
|
|
@ -579,7 +579,7 @@ void MonitorStream::runStream() {
|
||||||
gettimeofday( &now, NULL );
|
gettimeofday( &now, NULL );
|
||||||
|
|
||||||
if ( connkey ) {
|
if ( connkey ) {
|
||||||
//Debug(2, "checking command Queue for connkey: %d", connkey );
|
Debug(2, "checking command Queue for connkey: %d", connkey );
|
||||||
while(checkCommandQueue()) {
|
while(checkCommandQueue()) {
|
||||||
Debug(2, "Have checking command Queue for connkey: %d", connkey );
|
Debug(2, "Have checking command Queue for connkey: %d", connkey );
|
||||||
got_command = true;
|
got_command = true;
|
||||||
|
@ -664,7 +664,7 @@ Debug(2, "Have checking command Queue for connkey: %d", connkey );
|
||||||
if ( last_read_index != monitor->shared_data->last_write_index ) {
|
if ( last_read_index != monitor->shared_data->last_write_index ) {
|
||||||
int index = monitor->shared_data->last_write_index % monitor->image_buffer_count; // % shouldn't be neccessary
|
int index = monitor->shared_data->last_write_index % monitor->image_buffer_count; // % shouldn't be neccessary
|
||||||
last_read_index = monitor->shared_data->last_write_index;
|
last_read_index = monitor->shared_data->last_write_index;
|
||||||
//Debug( 1, "index: %d: frame_mod: %d frame count: %d", index, frame_mod, frame_count );
|
Debug( 1, "index: %d: frame_mod: %d frame count: %d", index, frame_mod, frame_count );
|
||||||
if ( (frame_mod == 1) || ((frame_count%frame_mod) == 0) ) {
|
if ( (frame_mod == 1) || ((frame_count%frame_mod) == 0) ) {
|
||||||
if ( !paused && !delayed ) {
|
if ( !paused && !delayed ) {
|
||||||
// Send the next frame
|
// Send the next frame
|
||||||
|
@ -681,7 +681,8 @@ Debug(2, "Have checking command Queue for connkey: %d", connkey );
|
||||||
|
|
||||||
temp_read_index = temp_write_index;
|
temp_read_index = temp_write_index;
|
||||||
}
|
}
|
||||||
}
|
} // end if should send frame
|
||||||
|
|
||||||
if ( buffered_playback ) {
|
if ( buffered_playback ) {
|
||||||
if ( monitor->shared_data->valid ) {
|
if ( monitor->shared_data->valid ) {
|
||||||
if ( monitor->image_buffer[index].timestamp->tv_sec ) {
|
if ( monitor->image_buffer[index].timestamp->tv_sec ) {
|
||||||
|
@ -711,10 +712,12 @@ Debug(2, "Have checking command Queue for connkey: %d", connkey );
|
||||||
}
|
}
|
||||||
} // end if buffered playback
|
} // end if buffered playback
|
||||||
frame_count++;
|
frame_count++;
|
||||||
|
} else {
|
||||||
|
Debug(2,"Waiting for capture");
|
||||||
} // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
|
} // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
|
||||||
|
|
||||||
unsigned long sleep_time = (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2)));
|
unsigned long sleep_time = (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2)));
|
||||||
Debug(4, "Sleeping for (%d)", sleep_time);
|
Debug(2, "Sleeping for (%d)", sleep_time);
|
||||||
usleep( sleep_time );
|
usleep( sleep_time );
|
||||||
if ( ttl ) {
|
if ( ttl ) {
|
||||||
if ( (now.tv_sec - stream_start_time) > ttl ) {
|
if ( (now.tv_sec - stream_start_time) > ttl ) {
|
||||||
|
|
|
@ -75,6 +75,7 @@ void StreamBase::updateFrameRate( double fps ) {
|
||||||
|
|
||||||
bool StreamBase::checkCommandQueue() {
|
bool StreamBase::checkCommandQueue() {
|
||||||
if ( sd >= 0 ) {
|
if ( sd >= 0 ) {
|
||||||
|
Debug(2, "sd is (%d)", sd );
|
||||||
CmdMsg msg;
|
CmdMsg msg;
|
||||||
memset( &msg, 0, sizeof(msg) );
|
memset( &msg, 0, sizeof(msg) );
|
||||||
int nbytes = recvfrom( sd, &msg, sizeof(msg), MSG_DONTWAIT, 0, 0 );
|
int nbytes = recvfrom( sd, &msg, sizeof(msg), MSG_DONTWAIT, 0, 0 );
|
||||||
|
@ -92,6 +93,8 @@ Debug(2, "Message length is (%d)", nbytes );
|
||||||
processCommand( &msg );
|
processCommand( &msg );
|
||||||
return( true );
|
return( true );
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
Error("sd is < 0");
|
||||||
}
|
}
|
||||||
return( false );
|
return( false );
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,26 +138,27 @@ function getAuthUser( $auth ) {
|
||||||
$authHash = md5( $authKey );
|
$authHash = md5( $authKey );
|
||||||
|
|
||||||
if ( $auth == $authHash ) {
|
if ( $auth == $authHash ) {
|
||||||
return( $user );
|
return $user;
|
||||||
}
|
}
|
||||||
} // end foreach hour
|
} // end foreach hour
|
||||||
} // end foreach user
|
} // end foreach user
|
||||||
} // end if using auth hash
|
} // end if using auth hash
|
||||||
Error( "Unable to authenticate user from auth hash '$auth'" );
|
Error( "Unable to authenticate user from auth hash '$auth'" );
|
||||||
return( false );
|
return( false );
|
||||||
}
|
} // end getAuthUser($auth)
|
||||||
|
|
||||||
function generateAuthHash( $useRemoteAddr ) {
|
function generateAuthHash( $useRemoteAddr ) {
|
||||||
if ( ZM_OPT_USE_AUTH and ZM_AUTH_RELAY == 'hashed' and isset($_SESSION['username']) and $_SESSION['passwordHash'] ) {
|
if ( ZM_OPT_USE_AUTH and ZM_AUTH_RELAY == 'hashed' and isset($_SESSION['username']) and $_SESSION['passwordHash'] ) {
|
||||||
# regenerate a hash at half the liftetime of a hash, an hour is 3600 so half is 1800
|
# regenerate a hash at half the liftetime of a hash, an hour is 3600 so half is 1800
|
||||||
if ( ( ! isset($_SESSION['AuthHash']) ) or ( $_SESSION['AuthHashGeneratedAt'] < time() - ( ZM_AUTH_HASH_TTL * 1800 ) ) ) {
|
$time = time();
|
||||||
|
if ( ( ! isset($_SESSION['AuthHash']) ) or ( $_SESSION['AuthHashGeneratedAt'] < ( $time - ( ZM_AUTH_HASH_TTL * 1800 ) ) ) ) {
|
||||||
# Don't both regenerating Auth Hash if an hour hasn't gone by yet
|
# Don't both regenerating Auth Hash if an hour hasn't gone by yet
|
||||||
$time = localtime();
|
$local_time = localtime();
|
||||||
$authKey = '';
|
$authKey = '';
|
||||||
if ( $useRemoteAddr ) {
|
if ( $useRemoteAddr ) {
|
||||||
$authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$time[2].$time[3].$time[4].$time[5];
|
$authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
|
||||||
} else {
|
} else {
|
||||||
$authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$time[2].$time[3].$time[4].$time[5];
|
$authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
|
||||||
}
|
}
|
||||||
$auth = md5( $authKey );
|
$auth = md5( $authKey );
|
||||||
if ( session_status() == PHP_SESSION_NONE ) {
|
if ( session_status() == PHP_SESSION_NONE ) {
|
||||||
|
@ -167,10 +168,10 @@ function generateAuthHash( $useRemoteAddr ) {
|
||||||
Warning("Session is not active. AuthHash will not be cached. called from $file:$line");
|
Warning("Session is not active. AuthHash will not be cached. called from $file:$line");
|
||||||
}
|
}
|
||||||
$_SESSION['AuthHash'] = $auth;
|
$_SESSION['AuthHash'] = $auth;
|
||||||
$_SESSION['AuthHashGeneratedAt'] = time();
|
$_SESSION['AuthHashGeneratedAt'] = $time;
|
||||||
Logger::Debug("Generated new auth $auth at " . $_SESSION['AuthHashGeneratedAt']. " using $authKey" );
|
Logger::Debug("Generated new auth $auth at " . $_SESSION['AuthHashGeneratedAt']. " using $authKey" );
|
||||||
} else {
|
} else {
|
||||||
Logger::Debug( "Using cached auth " . $_SESSION['AuthHash'] );
|
Logger::Debug( "Using cached auth " . $_SESSION['AuthHash'] ." beacuse " . $_SESSION['AuthHashGeneratedAt'] . ' < '. $time . ' - ' . ZM_AUTH_HASH_TTL . ' * 1800 = '.( $time - (ZM_AUTH_HASH_TTL * 1800) ));
|
||||||
} # end if AuthHash is not cached
|
} # end if AuthHash is not cached
|
||||||
return $_SESSION['AuthHash'];
|
return $_SESSION['AuthHash'];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -326,7 +326,7 @@ function changeGroup( e, depth ) {
|
||||||
}
|
}
|
||||||
function changeMonitor( e ) {
|
function changeMonitor( e ) {
|
||||||
var monitor_id = e.value;
|
var monitor_id = e.value;
|
||||||
Cookie.write( 'zmMonitorId', monitor_id, { duration: 10*365 } );
|
Cookie.write( 'MonitorId', monitor_id, { duration: 10*365 } );
|
||||||
window.location = window.location;
|
window.location = window.location;
|
||||||
}
|
}
|
||||||
function changeFilter( e ) {
|
function changeFilter( e ) {
|
||||||
|
|
|
@ -98,23 +98,23 @@ $groupSql = Group::get_group_sql( $group_id );
|
||||||
if ( $monitors[$i]['Id'] == $monitor_id ) {
|
if ( $monitors[$i]['Id'] == $monitor_id ) {
|
||||||
$found_selected_monitor = true;
|
$found_selected_monitor = true;
|
||||||
}
|
}
|
||||||
}
|
} // end foreach monitor
|
||||||
if ( ! $found_selected_monitor ) {
|
if ( ! $found_selected_monitor ) {
|
||||||
$monitor_id = '';
|
$monitor_id = '';
|
||||||
}
|
}
|
||||||
}
|
} // end if a monitor was specified
|
||||||
|
|
||||||
for ( $i = 0; $i < count($monitors); $i++ ) {
|
for ( $i = 0; $i < count($monitors); $i++ ) {
|
||||||
if ( !visibleMonitor( $monitors[$i]['Id'] ) ) {
|
if ( !visibleMonitor( $monitors[$i]['Id'] ) ) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$monitors_dropdown[$monitors[$i]['Id']] = $monitors[$i]['Name'];
|
|
||||||
|
|
||||||
if ( $monitor_id and ( $monitors[$i]['Id'] != $monitor_id ) ) {
|
if ( $monitor_id and ( $monitors[$i]['Id'] != $monitor_id ) ) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$displayMonitors[] = $monitors[$i];
|
$displayMonitors[] = $monitors[$i];
|
||||||
}
|
}
|
||||||
echo htmlSelect( 'MonitorId', $monitors_dropdown, $monitor_id, array('onchange'=>'changeMonitor(this);') );
|
echo htmlSelect( 'MonitorId', $monitors_dropdown, $monitor_id, array('onchange'=>'changeFilter(this);') );
|
||||||
?>
|
?>
|
||||||
</span>
|
</span>
|
||||||
<?php
|
<?php
|
||||||
|
|
|
@ -212,7 +212,10 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td class="colName"><?php echo makePopupLink( '?view=watch&mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
|
<td class="colName"><?php echo makePopupLink( '?view=watch&mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
|
||||||
<td class="colFunction"><?php echo makePopupLink( '?view=function&mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
|
<td class="colFunction">
|
||||||
|
<?php echo makePopupLink( '?view=function&mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?><br/>
|
||||||
|
<?php echo $monitor['CaptureFPS'] . ( ( $monitor['Function'] == 'Mocord' or $monitor['Function'] == 'Modect' ) ? ' / ' . $monitor['AnalysisFPS'] : '' ) . ' FPS' ?>
|
||||||
|
</td>
|
||||||
<?php
|
<?php
|
||||||
if ( count($servers) ) { ?>
|
if ( count($servers) ) { ?>
|
||||||
<td class="colServer"><?php $Server = isset($ServersById[$monitor['ServerId']]) ? $ServersById[$monitor['ServerId']] : new Server( $monitor['ServerId'] ); echo $Server->Name(); ?></td>
|
<td class="colServer"><?php $Server = isset($ServersById[$monitor['ServerId']]) ? $ServersById[$monitor['ServerId']] : new Server( $monitor['ServerId'] ); echo $Server->Name(); ?></td>
|
||||||
|
@ -267,7 +270,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
|
||||||
<td class="colId"><?php echo count($displayMonitors) ?></td>
|
<td class="colId"><?php echo count($displayMonitors) ?></td>
|
||||||
<td class="colLeftButtons" colspan="<?php echo $left_columns -1?>">
|
<td class="colLeftButtons" colspan="<?php echo $left_columns -1?>">
|
||||||
<input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
|
<input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
|
||||||
<input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
|
<input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor(this);"/>
|
||||||
<!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
|
<!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
|
||||||
<?php echo makePopupButton( '?view=filter&filter[terms][0][attr]=DateTime&filter[terms][0][op]=%3c&filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
|
<?php echo makePopupButton( '?view=filter&filter[terms][0][attr]=DateTime&filter[terms][0][op]=%3c&filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
|
||||||
<input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/>
|
<input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
var requestQueue = new Request.Queue( { concurrent: 2 } );
|
var requestQueue = new Request.Queue( { concurrent: 2, stopOnFailure: false } );
|
||||||
|
|
||||||
function Monitor( monitorData ) {
|
function Monitor( monitorData ) {
|
||||||
this.id = monitorData.id;
|
this.id = monitorData.id;
|
||||||
|
@ -29,6 +29,26 @@ function Monitor( monitorData ) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.onError = function( text, error ) {
|
||||||
|
console.log('onerror: ' + text + ' error:'+error);
|
||||||
|
// Requeue, but want to wait a while.
|
||||||
|
var streamCmdTimeout = 1000*statusRefreshTimeout;
|
||||||
|
this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this );
|
||||||
|
};
|
||||||
|
this.onFailure = function( xhr ) {
|
||||||
|
console.log('onFailure: ' + this.connKey);
|
||||||
|
console.log(xhr );
|
||||||
|
requestQueue.addRequest( "cmdReq"+this.id, this.streamCmdReq );
|
||||||
|
if ( 0 ) {
|
||||||
|
// Requeue, but want to wait a while.
|
||||||
|
if ( this.streamCmdTimer )
|
||||||
|
this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
|
||||||
|
var streamCmdTimeout = 1000*statusRefreshTimeout;
|
||||||
|
this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this, true );
|
||||||
|
requestQueue.resume();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
this.getStreamCmdResponse = function( respObj, respText ) {
|
this.getStreamCmdResponse = function( respObj, respText ) {
|
||||||
if ( this.streamCmdTimer )
|
if ( this.streamCmdTimer )
|
||||||
this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
|
this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
|
||||||
|
@ -110,21 +130,12 @@ function Monitor( monitorData ) {
|
||||||
};
|
};
|
||||||
|
|
||||||
this.streamCmdQuery = function( resent ) {
|
this.streamCmdQuery = function( resent ) {
|
||||||
if ( resent )
|
if ( resent ) {
|
||||||
console.log( this.connKey+": Resending" );
|
console.log( this.connKey+": Resending" );
|
||||||
//this.streamCmdReq.cancel();
|
this.streamCmdReq.cancel();
|
||||||
|
}
|
||||||
this.streamCmdReq.send( this.streamCmdParms+"&command="+CMD_QUERY );
|
this.streamCmdReq.send( this.streamCmdParms+"&command="+CMD_QUERY );
|
||||||
};
|
};
|
||||||
this.onError = function( text, error ) {
|
|
||||||
console.log('onerror: ' + text + ' error:'+error);
|
|
||||||
};
|
|
||||||
this.onFailure = function( xhr ) {
|
|
||||||
console.log('onFailure: ' );
|
|
||||||
console.log(xhr );
|
|
||||||
// Requeue
|
|
||||||
var streamCmdTimeout = statusRefreshTimeout;
|
|
||||||
this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this );
|
|
||||||
};
|
|
||||||
|
|
||||||
this.streamCmdReq = new Request.JSON( {
|
this.streamCmdReq = new Request.JSON( {
|
||||||
url: this.server_url,
|
url: this.server_url,
|
||||||
|
@ -193,10 +204,11 @@ function selectLayout( element ) {
|
||||||
if ( streamImg ) {
|
if ( streamImg ) {
|
||||||
if ( streamImg.nodeName == 'IMG' ) {
|
if ( streamImg.nodeName == 'IMG' ) {
|
||||||
var src = streamImg.src;
|
var src = streamImg.src;
|
||||||
streamImg.src='';
|
|
||||||
src = src.replace(/width=[\.\d]+/i,'width=0' );
|
src = src.replace(/width=[\.\d]+/i,'width=0' );
|
||||||
src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
|
if ( src != streamImg.src ) {
|
||||||
|
streamImg.src='';
|
||||||
streamImg.src = src;
|
streamImg.src = src;
|
||||||
|
}
|
||||||
} else if ( streamImg.nodeName == 'APPLET' || streamImg.nodeName == 'OBJECT' ) {
|
} else if ( streamImg.nodeName == 'APPLET' || streamImg.nodeName == 'OBJECT' ) {
|
||||||
// APPLET's and OBJECTS need to be re-initialized
|
// APPLET's and OBJECTS need to be re-initialized
|
||||||
}
|
}
|
||||||
|
@ -363,12 +375,17 @@ function cancel_layout(button) {
|
||||||
|
|
||||||
var monitors = new Array();
|
var monitors = new Array();
|
||||||
function initPage() {
|
function initPage() {
|
||||||
|
|
||||||
for ( var i = 0; i < monitorData.length; i++ ) {
|
for ( var i = 0; i < monitorData.length; i++ ) {
|
||||||
monitors[i] = new Monitor(monitorData[i]);
|
monitors[i] = new Monitor(monitorData[i]);
|
||||||
var delay = Math.round( (Math.random()+0.75)*statusRefreshTimeout );
|
|
||||||
monitors[i].start(delay);
|
|
||||||
}
|
}
|
||||||
selectLayout('#zmMontageLayout');
|
selectLayout('#zmMontageLayout');
|
||||||
|
|
||||||
|
for ( var i = 0; i < monitorData.length; i++ ) {
|
||||||
|
var delay = Math.round( (Math.random()+0.75)*statusRefreshTimeout );
|
||||||
|
console.log("Delay for monitor " + monitorData[i].id + " is " + delay );
|
||||||
|
monitors[i].start(delay);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Kick everything off
|
// Kick everything off
|
||||||
window.addEvent( 'domready', initPage );
|
window.addEvent( 'domready', initPage );
|
||||||
|
|
Loading…
Reference in New Issue