D3Public/oxid-sql-logger
8
0
Fork 0
Code Pull Requests Releases Activity

autogenerate log position informations,

Browse Source 
does not need log positions parameters anymore when called
This commit is contained in:
Daniel Seifert 2019-09-20 10:40:01 +02:00
parent 90c055d1cb
commit 7705abd09e
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/OxidEsalesDatabase.php
View File

@ -15,11 +15,21 @@ use Doctrine\DBAL\Configuration;
*/ */
class OxidEsalesDatabase extends \OxidEsales\Eshop\Core\Database\Adapter\Doctrine\Database class OxidEsalesDatabase extends \OxidEsales\Eshop\Core\Database\Adapter\Doctrine\Database
{ {
public static function enableLogger($message = null, $file = null, $line = null) public static function enableLogger($message = null)
{ {
$trace = debug_backtrace((PHP_VERSION_ID < 50306) ? 2 : DEBUG_BACKTRACE_IGNORE_ARGS);
$database = \OxidEsales\Eshop\Core\DatabaseProvider::getDb(\OxidEsales\Eshop\Core\DatabaseProvider::FETCH_MODE_ASSOC); $database = \OxidEsales\Eshop\Core\DatabaseProvider::getDb(\OxidEsales\Eshop\Core\DatabaseProvider::FETCH_MODE_ASSOC);
$dbalConfig = $database->getConnection()->getConfiguration(); $dbalConfig = $database->getConnection()->getConfiguration();
$dbalConfig->setSQLLogger(new OxidSQLLogger($message, $file, $line)); $dbalConfig->setSQLLogger(
new OxidSQLLogger(
isset($trace[1]['file']) ? $trace[1]['file'] : null,
isset($trace[1]['line']) ? $trace[1]['line'] : null,
isset($trace[2]['class']) ? $trace[2]['class'] : null,
isset($trace[2]['function']) ? $trace[2]['function'] : null,
$message
)
);
} }
/** /**

29
src/OxidSQLLogger.php
View File

@ -16,21 +16,25 @@ use Monolog;
class OxidSQLLogger implements SQLLogger class OxidSQLLogger implements SQLLogger
{ {
public $message; public $message;
public $file; public $logStartingFile;
public $line; public $logStartingLine;
public $logStartingClass;
public $logStartingFunction;
/** /**
* @inheritDoc * @inheritDoc
*/ */
public function __construct($message = null, $file = null, $line = null) public function __construct($file, $line, $class, $function, $message = null)
{ {
if (!Monolog\Registry::hasLogger('sql')) { if (!Monolog\Registry::hasLogger('sql')) {
Monolog\Registry::addLogger((new LoggerFactory())->create('sql')); Monolog\Registry::addLogger((new LoggerFactory())->create('sql'));
} }
$this->message = $message; $this->message = $message;
$this->file = $file; $this->logStartingFile = $file;
$this->line = $line; $this->logStartingLine = $line;
$this->logStartingClass = $class;
$this->logStartingFunction = $function;
} }
/** /**
@ -41,11 +45,14 @@ class OxidSQLLogger implements SQLLogger
Monolog\Registry::sql()->addDebug( Monolog\Registry::sql()->addDebug(
$this->message ? $this->message : $sql, $this->message ? $this->message : $sql,
[ [
'query' => $sql, 'query' => $sql,
'params' => $params, 'params' => $params,
'types' => $types, 'types' => $types,
'calling_file' => $this->file, 'logStartingFile' => $this->logStartingFile,
'calling_line' => $this->line 'logStartingLine' => $this->logStartingLine,
'logStartingClass' => $this->logStartingClass,
'logStartingFunction' => $this->logStartingFunction,
] ]
); );
} }

4
src/functions.php
View File

@ -5,8 +5,8 @@
* @author D3 Data Development - Daniel Seifert <support@shopmodule.com> * @author D3 Data Development - Daniel Seifert <support@shopmodule.com>
*/ */
function D3StartSQLLog($message = null, $file = null, $line = null) { function D3StartSQLLog($message = null) {
\D3\OxidSqlLogger\OxidEsalesDatabase::enableLogger($message, $file, $line); \D3\OxidSqlLogger\OxidEsalesDatabase::enableLogger($message);
} }
function D3StopSQLLog() { function D3StopSQLLog() {