cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimisation no 5: cache events totals for 5min + sql optimization

Browse Source
This commit is contained in:
jokob-sk
2022-08-05 16:52:59 +10:00
parent 75c901a111
commit 8650c68801
3 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
front/php/server/devices.php
View File

@@ -811,21 +811,5 @@ function getDeviceCondition ($deviceStatus) {
} }
} }
//------------------------------------------------------------------------------
// Simple cookie cache
//------------------------------------------------------------------------------
function getCache($key) {
if( isset($_COOKIE[$key]))
{
return $_COOKIE[$key];
}else
{
return "";
}
}
function setCache($key, $value) {
setcookie($key, $value, time()+300, "/","", 0); // 5min cache
}
?> ?>

82
front/php/server/events.php
View File

@@ -52,51 +52,57 @@ function getEventsTotals() {
global $db; global $db;
// Request Parameters // Request Parameters
$periodDate = getDateFromPeriod(); $periodDate = $_REQUEST['period'];
// SQL $periodDateSQL = "";
$SQL1 = 'SELECT Count(*) $days = "";
FROM Events
WHERE eve_DateTime >= '. $periodDate;
$SQL2 = 'SELECT Count(*)
FROM Sessions ';
// All switch ($periodDate) {
$result = $db->query($SQL1); case '7 days':
$row = $result -> fetchArray (SQLITE3_NUM); $days = "7";
$eventsAll = $row[0]; break;
case '1 month':
$days = "30";
break;
case '1 year':
$days = "365";
break;
case '100 years':
$days = "3650"; //10 years
break;
default:
$days = "1";
}
// Sessions $periodDateSQL = "-".$days." day";
$result = $db->query($SQL2. ' WHERE ( ses_DateTimeConnection >= '. $periodDate .'
OR ses_DateTimeDisconnection >= '. $periodDate .'
OR ses_StillConnected = 1 ) ');
$row = $result -> fetchArray (SQLITE3_NUM);
$eventsSessions = $row[0];
// Missing $resultJSON = "";
$result = $db->query($SQL2. ' WHERE (ses_DateTimeConnection IS NULL AND ses_DateTimeDisconnection >= '. $periodDate .' )
OR (ses_DateTimeDisconnection IS NULL AND ses_StillConnected = 0 AND ses_DateTimeConnection >= '. $periodDate .' )' );
$row = $result -> fetchArray (SQLITE3_NUM);
$eventsMissing = $row[0];
// Voided // check cache if JSON available in a cookie
$result = $db->query($SQL1. ' AND eve_EventType LIKE "VOIDED%" '); if(getCache("getEventsTotals".$days) != "")
$row = $result -> fetchArray (SQLITE3_NUM); {
$eventsVoided = $row[0]; $resultJSON = getCache("getEventsTotals".$days);
} else
{
// one query to get all numbers, whcih is quicker than multiple queries
$sql = "select
(SELECT Count(*) FROM Events WHERE eve_DateTime >= date('now', '".$periodDateSQL."')) as all_events,
(SELECT Count(*) FROM Sessions as sessions WHERE ( ses_DateTimeConnection >= date('now', '".$periodDateSQL."') OR ses_DateTimeDisconnection >= date('now', '".$periodDateSQL."') OR ses_StillConnected = 1 )) as sessions,
(SELECT Count(*) FROM Sessions WHERE ((ses_DateTimeConnection IS NULL AND ses_DateTimeDisconnection >= date('now', '".$periodDateSQL."' )) OR (ses_DateTimeDisconnection IS NULL AND ses_StillConnected = 0 AND ses_DateTimeConnection >= date('now', '".$periodDateSQL."' )))) as missing,
(SELECT Count(*) FROM Events WHERE eve_DateTime >= date('now', '".$periodDateSQL."') AND eve_EventType LIKE 'VOIDED%' ) as voided,
(SELECT Count(*) FROM Events WHERE eve_DateTime >= date('now', '".$periodDateSQL."') AND eve_EventType LIKE 'New Device' ) as new,
(SELECT Count(*) FROM Events WHERE eve_DateTime >= date('now', '".$periodDateSQL."') AND eve_EventType LIKE 'Device Down' ) as down";
// New $result = $db->query($sql);
$result = $db->query($SQL1. ' AND eve_EventType LIKE "New Device" '); $row = $result -> fetchArray (SQLITE3_NUM);
$row = $result -> fetchArray (SQLITE3_NUM); $resultJSON = json_encode (array ($row[0], $row[1], $row[2], $row[3], $row[4], $row[5]));
$eventsNew = $row[0];
// Down // save JSON result to cache
$result = $db->query($SQL1. ' AND eve_EventType LIKE "Device Down" '); setCache("getEventsTotals".$days, $resultJSON );
$row = $result -> fetchArray (SQLITE3_NUM); }
$eventsDown = $row[0];
// Return json
// Return json echo ($resultJSON);
echo (json_encode (array ($eventsAll, $eventsSessions, $eventsMissing, $eventsVoided, $eventsNew, $eventsDown)));
} }

20
front/php/server/util.php
View File

@@ -73,4 +73,24 @@ function getNetworkTypes(){
return $array; return $array;
} }
//------------------------------------------------------------------------------
// Simple cookie cache
//------------------------------------------------------------------------------
function getCache($key) {
if( isset($_COOKIE[$key]))
{
return $_COOKIE[$key];
}else
{
return "";
}
}
function setCache($key, $value) {
setcookie($key, $value, time()+300, "/","", 0); // 5min cache
}
?> ?>