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

add caching to Monitor

This commit is contained in:
Isaac Connor 2018-09-15 09:38:52 -04:00
parent 27bc9d0a50
commit 02403c4c30
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/includes/Monitor.php
View File

@ -2,6 +2,8 @@
require_once('database.php'); require_once('database.php');
require_once('Server.php'); require_once('Server.php');
$monitor_cache = array();
class Monitor { class Monitor {
private $defaults = array( private $defaults = array(
@ -165,6 +167,8 @@ private $control_fields = array(
} }
} }
} }
global $monitor_cache;
$monitor_cache[$row['Id']] = $row;
} else { } else {
Error('No row for Monitor ' . $IdOrRow); Error('No row for Monitor ' . $IdOrRow);
@ -306,26 +310,33 @@ private $control_fields = array(
} }
if ( isset($options['limit']) ) { if ( isset($options['limit']) ) {
if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) { if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) {
$sql .= ' LIMIT ' . $limit; $sql .= ' LIMIT ' . $options['limit'];
} else { } else {
$backTrace = debug_backtrace(); $backTrace = debug_backtrace();
$file = $backTrace[1]['file']; $file = $backTrace[1]['file'];
$line = $backTrace[1]['line']; $line = $backTrace[1]['line'];
Error("Invalid value for limit($limit) passed to Control::find from $file:$line"); Error("Invalid value for limit(".$options['limit'].") passed to Control::find from $file:$line");
return array(); return array();
} }
} }
} }
$monitors = array(); $monitors = array();
$result = dbQuery($sql, $values); $result = dbQuery($sql, $values);
$results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Monitor'); $results = $result->fetchALL();
foreach ( $results as $row => $obj ) { foreach ( $results as $row ) {
$monitors[] = $obj; $monitors[] = new Monitor($row);
} }
return $monitors; return $monitors;
} # end find } # end find
public static function find_one( $parameters = array() ) { public static function find_one( $parameters = array() ) {
global $monitor_cache;
if (
( count($parameters) == 1 ) and
isset($parameters['Id']) and
isset($monitor_cache[$parameters['Id']]) ) {
return $monitor_cache[$parameters['Id']];
}
$results = Monitor::find( $parameters, array('limit'=>1) ); $results = Monitor::find( $parameters, array('limit'=>1) );
if ( ! sizeof($results) ) { if ( ! sizeof($results) ) {
return; return;