- new "activity log" for user actions (create/update/delete) of (systems/connections/signatures), resolves #280, relates #271
- new added cronjob to delete old statistics data (older 1 year) (weekly) - updated main menu structure (added new headlines,...) - updated "feature page", added new section for "statistics" - updated "system delete" function. systems with no changes (description/alias) will now get deleted instead of set "active = 0", #184 - changed max expire time from file caching (/tmp/cache) from 20d -> 10d - changed "character log" TTL from 10s to 5s - changed cronjob interval for "deleteExpiredData" from "weekly" to "downtime" - changed "delete" icon (e.g. context menu on map) from "eraser" to "trash" - removed cronjob output logging (cron_deactivateMapData.log) - fixed non click-able character panels on login page, closed #332
This commit is contained in:
@@ -7,10 +7,128 @@
|
||||
*/
|
||||
|
||||
namespace controller;
|
||||
use DB;
|
||||
|
||||
class LogController extends \Prefab {
|
||||
|
||||
class LogController extends Controller {
|
||||
/**
|
||||
* buffered activity log data for this singleton LogController() class
|
||||
* -> this buffered data can be stored somewhere (e.g. DB) before HTTP response
|
||||
* -> should be cleared afterwards!
|
||||
* @var array
|
||||
*/
|
||||
protected $activityLogBuffer = [];
|
||||
|
||||
/**
|
||||
* reserve a "new" character activity for logging
|
||||
* @param $characterId
|
||||
* @param $mapId
|
||||
* @param $action
|
||||
*/
|
||||
public function bufferActivity($characterId, $mapId, $action){
|
||||
$characterId = (int)$characterId;
|
||||
$mapId = (int)$mapId;
|
||||
|
||||
if(
|
||||
$characterId > 0 &&
|
||||
$mapId > 0
|
||||
){
|
||||
$key = $this->getBufferedActivityKey($characterId, $mapId);
|
||||
|
||||
if( is_null($key) ){
|
||||
$activity = [
|
||||
'characterId' => $characterId,
|
||||
'mapId' => $mapId,
|
||||
$action => 1
|
||||
];
|
||||
$this->activityLogBuffer[] = $activity;
|
||||
}else{
|
||||
$this->activityLogBuffer[$key][$action]++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* store all buffered activity log data to DB
|
||||
*/
|
||||
public function storeActivities(){
|
||||
if( !empty($this->activityLogBuffer) ){
|
||||
$db = DB\Database::instance()->getDB('PF');
|
||||
|
||||
$quoteStr = function($str) use ($db) {
|
||||
return $db->quotekey($str);
|
||||
};
|
||||
|
||||
$placeholderStr = function($str){
|
||||
return ':' . $str;
|
||||
};
|
||||
|
||||
$updateRule = function($str){
|
||||
return $str . " = " . $str . " + VALUES(" . $str . ")";
|
||||
};
|
||||
|
||||
$year = (int)date('o');
|
||||
$yearWeek = (int)date('W');
|
||||
$db->begin();
|
||||
|
||||
foreach($this->activityLogBuffer as $activityData){
|
||||
$activityData['year'] = $year;
|
||||
$activityData['week'] = $yearWeek;
|
||||
|
||||
$columns = array_keys($activityData);
|
||||
$columnsQuoted = array_map($quoteStr, $columns);
|
||||
$placeholder = array_map($placeholderStr, $columns);
|
||||
$args = array_combine($placeholder, $activityData);
|
||||
|
||||
// "filter" columns that can be updated
|
||||
$columnsForUpdate = array_diff($columns, ['year', 'week', 'characterId', 'mapId']);
|
||||
$updateSql = array_map($updateRule, $columnsForUpdate);
|
||||
|
||||
$sql = "INSERT DELAYED INTO
|
||||
activity_log (" . implode(', ', $columnsQuoted) . ") values(
|
||||
" . implode(', ', $placeholder) . "
|
||||
)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
updated = NOW(),
|
||||
" . implode(', ', $updateSql) . "
|
||||
";
|
||||
|
||||
$db->exec($sql, $args);
|
||||
}
|
||||
|
||||
$db->commit();
|
||||
|
||||
// clear activity data for this instance
|
||||
$this->activityLogBuffer = [];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get array key from "buffered activity log" array
|
||||
* @param int $characterId
|
||||
* @param int $mapId
|
||||
* @return int|null
|
||||
*/
|
||||
private function getBufferedActivityKey($characterId, $mapId){
|
||||
$activityKey = null;
|
||||
|
||||
if(
|
||||
$characterId > 0 &&
|
||||
$mapId > 0
|
||||
){
|
||||
foreach($this->activityLogBuffer as $key => $activityData){
|
||||
if(
|
||||
$activityData['characterId'] === $characterId &&
|
||||
$activityData['mapId'] === $mapId
|
||||
){
|
||||
$activityKey = $key;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $activityKey;
|
||||
}
|
||||
|
||||
/**
|
||||
* get Logger instance
|
||||
|
||||
Reference in New Issue
Block a user