dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- new "_NPC faction_" added for k-space systems, closed #773

Browse Source 
- improved file structure for _Model_ classes (`app/main/model/..`). Group by database name
- improved database connection handling (fixed persistent DB connections)
This commit is contained in:
Mark Friedrich
2019-04-12 21:34:29 +02:00
parent c21e33d231
commit a33615445e
117 changed files with 1578 additions and 1277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/main/controller/logcontroller.php
View File

@@ -7,11 +7,11 @@
*/
namespace controller;
use DB;
use lib\Config;
use lib\logging\MapLog;
use Model\ActivityLogModel;
use Model\BasicModel;
use Model\Pathfinder;
class LogController extends \Prefab {
@@ -41,9 +41,9 @@ class LogController extends \Prefab {
$f3 = \Base::instance();
if(!$f3->exists(self::CACHE_KEY_ACTIVITY_COLUMNS, $this->activityLogColumns)){
/**
* @var $activityLogModel ActivityLogModel
* @var $activityLogModel Pathfinder\ActivityLogModel
*/
$activityLogModel = BasicModel::getNew('ActivityLogModel');
$activityLogModel = Pathfinder\AbstractPathfinderModel::getNew('ActivityLogModel');
$this->activityLogColumns = $activityLogModel->getCountableColumnNames();
$f3->set(self::CACHE_KEY_ACTIVITY_COLUMNS, self::CACHE_TTL_ACTIVITY_COLUMNS);
}
@@ -86,7 +86,7 @@ class LogController extends \Prefab {
*/
public function logActivities(){
if( !empty($this->activityLogBuffer) ){
$db = DB\Database::instance()->getDB('PF');
$db = \Base::instance()->DB->getDB('PF');
$quoteStr = function($str) use ($db) {
return $db->quotekey($str);
@@ -166,12 +166,8 @@ class LogController extends \Prefab {
*/
public static function getLogger(string $type) : \Log {
$logFiles = Config::getPathfinderData('logfiles');
$logFileName = empty($logFiles[$type]) ? 'error' : $logFiles[$type];
$logFile = $logFileName . '.log';
$logger = new \Log($logFile);
return $logger;
return new \Log($logFileName . '.log');
}
}