Skip to content
Extraits de code Groupes Projets
Valider 83431266 rédigé par Matthieu Napoli's avatar Matthieu Napoli
Parcourir les fichiers

Merge pull request #7118 from piwik/log-plugin 

Monolog plugin
parents dc76362a e122a4e3
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 90 ajouts et 130 suppressions
config/global.ini.php
+ 1
− 0
Voir le fichier @ 83431266
......@@ -732,6 +732,7 @@ Plugins[] = ExampleAPI
Plugins[] = ExampleRssWidget
Plugins[] = Provider
Plugins[] = Feedback
Plugins[] = Monolog
Plugins[] = Login
Plugins[] = UsersManager
......
config/global.php
+ 1
− 83
Voir le fichier @ 83431266
<?php
use Interop\Container\ContainerInterface;
use Monolog\Logger;
use Piwik\Log;
use Piwik\Cache\Eager;
use Piwik\SettingsServer;
......@@ -52,87 +50,7 @@ return array(
return 'eagercache-' . str_replace(array('.', '-'), '', \Piwik\Version::VERSION) . '-';
},
// Log
'Psr\Log\LoggerInterface' => DI\object('Monolog\Logger')
->constructor('piwik', DI\link('log.handlers'), DI\link('log.processors')),
'log.handlers' => DI\factory(function (ContainerInterface $c) {
if ($c->has('ini.log.log_writers')) {
$writerNames = $c->get('ini.log.log_writers');
} else {
return array();
}
$classes = array(
'file' => 'Piwik\Log\Handler\FileHandler',
'screen' => 'Piwik\Log\Handler\WebNotificationHandler',
'database' => 'Piwik\Log\Handler\DatabaseHandler',
);
$writerNames = array_map('trim', $writerNames);
$writers = array();
foreach ($writerNames as $writerName) {
if (isset($classes[$writerName])) {
$writers[$writerName] = $c->get($classes[$writerName]);
}
}
return array_values($writers);
}),
'log.processors' => array(
DI\link('Piwik\Log\Processor\ClassNameProcessor'),
DI\link('Piwik\Log\Processor\RequestIdProcessor'),
DI\link('Piwik\Log\Processor\ExceptionToTextProcessor'),
DI\link('Piwik\Log\Processor\SprintfProcessor'),
DI\link('Monolog\Processor\PsrLogMessageProcessor'),
),
'Piwik\Log\Handler\FileHandler' => DI\object()
->constructor(DI\link('log.file.filename'), DI\link('log.level'))
->method('setFormatter', DI\link('Piwik\Log\Formatter\LineMessageFormatter')),
'Piwik\Log\Handler\DatabaseHandler' => DI\object()
->constructor(DI\link('log.level'))
->method('setFormatter', DI\link('Piwik\Log\Formatter\LineMessageFormatter')),
'Piwik\Log\Handler\WebNotificationHandler' => DI\object()
->constructor(DI\link('log.level'))
->method('setFormatter', DI\link('Piwik\Log\Formatter\LineMessageFormatter')),
'log.level' => DI\factory(function (ContainerInterface $c) {
if ($c->has('ini.log.log_level')) {
$level = strtoupper($c->get('ini.log.log_level'));
if (!empty($level) && defined('Piwik\Log::'.strtoupper($level))) {
return Log::getMonologLevel(constant('Piwik\Log::'.strtoupper($level)));
}
}
return Logger::WARNING;
}),
'log.file.filename' => DI\factory(function (ContainerInterface $c) {
$logPath = $c->get('ini.log.logger_file_path');
// Absolute path
if (strpos($logPath, '/') === 0) {
return $logPath;
}
// Remove 'tmp/' at the beginning
if (strpos($logPath, 'tmp/') === 0) {
$logPath = substr($logPath, strlen('tmp'));
}
if (empty($logPath)) {
// Default log file
$logPath = '/logs/piwik.log';
}
$logPath = $c->get('path.tmp') . $logPath;
if (is_dir($logPath)) {
$logPath .= '/piwik.log';
}
return $logPath;
}),
'Piwik\Log\Formatter\LineMessageFormatter' => DI\object()
->constructor(DI\link('log.format')),
'log.format' => DI\factory(function (ContainerInterface $c) {
if ($c->has('ini.log.string_message_format')) {
return $c->get('ini.log.string_message_format');
}
return '%level% %tag%[%datetime%] %message%';
}),
'Psr\Log\LoggerInterface' => DI\object('Psr\Log\NullLogger'),
'Piwik\Translation\Loader\LoaderInterface' => DI\object('Piwik\Translation\Loader\LoaderCache')
->constructor(DI\link('Piwik\Translation\Loader\JsonFileLoader')),
......
core/Updates/2.11.0-b5.php 0 → 100644
+ 23
− 0
Voir le fichier @ 83431266
<?php
/**
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Updates;
use Piwik\Plugin\Manager;
use Piwik\Updates;
class Updates_2_11_0_b5 extends Updates
{
static function update()
{
try {
Manager::getInstance()->activatePlugin('Monolog');
} catch (\Exception $e) {
}
}
}
core/Version.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -20,7 +20,7 @@ final class Version
* The current Piwik version.
* @var string
*/
const VERSION = '2.11.0-b4';
const VERSION = '2.11.0-b5';
public function isStableVersion($version)
{
......
misc/cron/archive.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -73,7 +73,7 @@ if (isset($_SERVER['argv']) && Piwik\Console::isSupported()) {
/** @var \Monolog\Logger $logger */
$logger = StaticContainer::get('Psr\Log\LoggerInterface');
$handler = new StreamHandler('php://output', Logger::INFO);
$handler->setFormatter(StaticContainer::get('Piwik\Log\Formatter\LineMessageFormatter'));
$handler->setFormatter(StaticContainer::get('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter'));
$logger->pushHandler($handler);
}
......
core/Log/Formatter/LineMessageFormatter.php → plugins/Monolog/Formatter/LineMessageFormatter.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Log\Formatter;
namespace Piwik\Plugins\Monolog\Formatter;
use Monolog\Formatter\FormatterInterface;
......
core/Log/Handler/DatabaseHandler.php → plugins/Monolog/Handler/DatabaseHandler.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Log\Handler;
namespace Piwik\Plugins\Monolog\Handler;
use Monolog\Handler\AbstractProcessingHandler;
use Piwik\Common;
......
core/Log/Handler/FileHandler.php → plugins/Monolog/Handler/FileHandler.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Log\Handler;
namespace Piwik\Plugins\Monolog\Handler;
use Monolog\Handler\StreamHandler;
use Piwik\Filechecks;
......
core/Log/Handler/WebNotificationHandler.php → plugins/Monolog/Handler/WebNotificationHandler.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Log\Handler;
namespace Piwik\Plugins\Monolog\Handler;
use Monolog\Handler\AbstractProcessingHandler;
use Monolog\Logger;
......
plugins/Monolog/Monolog.php 0 → 100644
+ 15
− 0
Voir le fichier @ 83431266
<?php
/**
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Plugins\Monolog;
use Piwik\Plugin;
class Monolog extends Plugin
{
}
core/Log/Processor/ClassNameProcessor.php → plugins/Monolog/Processor/ClassNameProcessor.php
+ 14
− 4
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Log\Processor;
namespace Piwik\Plugins\Monolog\Processor;
use Piwik\Plugin;
......@@ -52,7 +52,7 @@ class ClassNameProcessor
private function getClassNameThatIsLogging($backtrace)
{
foreach ($backtrace as $line) {
if (isset($line['class']) && !in_array($line['class'], $this->skippedClasses)) {
if (isset($line['class'])) {
return $line['class'];
}
}
......@@ -63,9 +63,19 @@ class ClassNameProcessor
private function getBacktrace()
{
if (version_compare(phpversion(), '5.3.6', '>=')) {
return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
} else {
$backtrace = debug_backtrace();
}
return debug_backtrace();
$skippedClasses = $this->skippedClasses;
$backtrace = array_filter($backtrace, function ($item) use ($skippedClasses) {
if (isset($item['class'])) {
return !in_array($item['class'], $skippedClasses);
}
return true;
});
return $backtrace;
}
}
core/Log/Processor/ExceptionToTextProcessor.php → plugins/Monolog/Processor/ExceptionToTextProcessor.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Log\Processor;
namespace Piwik\Plugins\Monolog\Processor;
use Piwik\ErrorHandler;
use Piwik\Log;
......
core/Log/Processor/RequestIdProcessor.php → plugins/Monolog/Processor/RequestIdProcessor.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Log\Processor;
namespace Piwik\Plugins\Monolog\Processor;
use Piwik\Common;
......
core/Log/Processor/SprintfProcessor.php → plugins/Monolog/Processor/SprintfProcessor.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Log\Processor;
namespace Piwik\Plugins\Monolog\Processor;
/**
* Processes a log message using `sprintf()`.
......
tests/PHPUnit/Integration/Log/Fixture/LoggerWrapper.php → plugins/Monolog/Test/Integration/Fixture/LoggerWrapper.php
+ 1
− 1
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Tests\Integration\Log\Fixture;
namespace Piwik\Plugins\Monolog\Test\Integration\Fixture;
use Piwik\Log;
......
tests/PHPUnit/Integration/Log/LogTest.php → plugins/Monolog/Test/Integration/LogTest.php
+ 11
− 15
Voir le fichier @ 83431266
......@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Tests\Integration\Log;
namespace Piwik\Plugins\Monolog\Test\Integration;
use Exception;
use Piwik\Common;
......@@ -15,8 +15,8 @@ use Piwik\Container\ContainerFactory;
use Piwik\Container\StaticContainer;
use Piwik\Db;
use Piwik\Log;
use Piwik\Plugins\Monolog\Test\Integration\Fixture\LoggerWrapper;
use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
use Piwik\Tests\Integration\Log\Fixture\LoggerWrapper;
/**
* @group Core
......@@ -28,10 +28,10 @@ class LogTest extends IntegrationTestCase
const STRING_MESSAGE_FORMAT = '[%tag%] %message%';
const STRING_MESSAGE_FORMAT_SPRINTF = "[%s] %s";
public static $expectedExceptionOutput = '[Piwik\Tests\Integration\Log\LogTest] LogTest.php(120): dummy error message
public static $expectedExceptionOutput = '[Monolog] LogTest.php(120): dummy error message
dummy backtrace';
public static $expectedErrorOutput = '[Piwik\Tests\Integration\Log\LogTest] dummyerrorfile.php(145): Unknown error (102) - dummy error string
public static $expectedErrorOutput = '[Monolog] dummyerrorfile.php(145): Unknown error (102) - dummy error string
dummy backtrace';
public function setUp()
......@@ -82,7 +82,7 @@ class LogTest extends IntegrationTestCase
Log::warning(self::TESTMESSAGE);
$this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, $tag = __CLASS__);
$this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, $tag = 'Monolog');
}
/**
......@@ -94,7 +94,7 @@ class LogTest extends IntegrationTestCase
Log::warning(self::TESTMESSAGE, " subst ");
$this->checkBackend($backend, sprintf(self::TESTMESSAGE, " subst "), $formatMessage = true, $tag = __CLASS__);
$this->checkBackend($backend, sprintf(self::TESTMESSAGE, " subst "), $formatMessage = true, $tag = 'Monolog');
}
/**
......@@ -107,7 +107,7 @@ class LogTest extends IntegrationTestCase
$error = new \ErrorException("dummy error string", 0, 102, "dummyerrorfile.php", 145);
Log::error($error);
$this->checkBackend($backend, self::$expectedErrorOutput, $formatMessage = false, $tag = __CLASS__);
$this->checkBackend($backend, self::$expectedErrorOutput, $formatMessage = false, $tag = 'Monolog');
}
/**
......@@ -120,7 +120,7 @@ class LogTest extends IntegrationTestCase
$exception = new Exception("dummy error message");
Log::error($exception);
$this->checkBackend($backend, self::$expectedExceptionOutput, $formatMessage = false, $tag = __CLASS__);
$this->checkBackend($backend, self::$expectedExceptionOutput, $formatMessage = false, $tag = 'Monolog');
}
/**
......@@ -132,9 +132,7 @@ class LogTest extends IntegrationTestCase
LoggerWrapper::doLog(self::TESTMESSAGE);
$tag = 'Piwik\Tests\Integration\Log\Fixture\LoggerWrapper';
$this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, $tag);
$this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, 'Monolog');
}
/**
......@@ -159,9 +157,7 @@ class LogTest extends IntegrationTestCase
LoggerWrapper::doLog(" \n ".self::TESTMESSAGE."\n\n\n \n");
$tag = 'Piwik\Tests\Integration\Log\Fixture\LoggerWrapper';
$this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, $tag);
$this->checkBackend($backend, self::TESTMESSAGE, $formatMessage = true, 'Monolog');
}
/**
......@@ -176,7 +172,7 @@ class LogTest extends IntegrationTestCase
Log::info(self::TESTMESSAGE);
$this->checkBackend('database', self::TESTMESSAGE, $formatMessage = true, $tag = __CLASS__);
$this->checkBackend('database', self::TESTMESSAGE, $formatMessage = true, $tag = 'Monolog');
}
private function checkBackend($backend, $expectedMessage, $formatMessage = false, $tag = false)
......
tests/PHPUnit/Unit/Log/Formatter/LineMessageFormatterTest.php → plugins/Monolog/Test/Unit/Formatter/LineMessageFormatterTest.php
+ 3
− 4
Voir le fichier @ 83431266
......@@ -6,15 +6,14 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Tests\Unit\Log\Formatter;
namespace Piwik\Plugins\Monolog\Test\Unit\Formatter;
use DateTime;
use Piwik\Log\Formatter\LineMessageFormatter;
use Piwik\Plugins\Monolog\Formatter\LineMessageFormatter;
/**
* @group Core
* @group Log
* @covers \Piwik\Log\Formatter\LineMessageFormatter
* @covers \Piwik\Plugins\Monolog\Formatter\LineMessageFormatter
*/
class LineMessageFormatterTest extends \PHPUnit_Framework_TestCase
{
......
tests/PHPUnit/Unit/Log/Processor/ClassNameProcessorTest.php → plugins/Monolog/Test/Unit/Processor/ClassNameProcessorTest.php
+ 4
− 5
Voir le fichier @ 83431266
......@@ -6,14 +6,13 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Tests\Unit\Log\Processor;
namespace Piwik\Plugins\Monolog\Test\Unit\Processor;
use Piwik\Log\Processor\ClassNameProcessor;
use Piwik\Plugins\Monolog\Processor\ClassNameProcessor;
/**
* @group Core
* @group Log
* @covers \Piwik\Log\Processor\ClassNameProcessor
* @covers \Piwik\Plugins\Monolog\Processor\ClassNameProcessor
*/
class ClassNameProcessorTest extends \PHPUnit_Framework_TestCase
{
......@@ -33,7 +32,7 @@ class ClassNameProcessorTest extends \PHPUnit_Framework_TestCase
$expected = array(
'extra' => array(
'foo' => 'bar',
'class' => __CLASS__,
'class' => 'Monolog',
),
);
......
tests/PHPUnit/Unit/Log/Processor/ExceptionToTextProcessorTest.php → plugins/Monolog/Test/Unit/Processor/ExceptionToTextProcessorTest.php
+ 4
− 5
Voir le fichier @ 83431266
......@@ -6,15 +6,14 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Tests\Unit\Log\Processor;
namespace Piwik\Plugins\Monolog\Test\Unit\Processor;
use Piwik\Log;
use Piwik\Log\Processor\ExceptionToTextProcessor;
use Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor;
/**
* @group Core
* @group Log
* @covers \Piwik\Log\Processor\ExceptionToTextProcessor
* @covers \Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor
*/
class ExceptionToTextProcessorTest extends \PHPUnit_Framework_TestCase
{
......@@ -48,7 +47,7 @@ class ExceptionToTextProcessorTest extends \PHPUnit_Framework_TestCase
$result = $processor($record);
$expected = array(
'message' => __FILE__ . "(41): Hello world\n[stack trace]",
'message' => __FILE__ . "(40): Hello world\n[stack trace]",
'context' => array(
'exception' => $exception,
),
......
tests/PHPUnit/Unit/Log/Processor/RequestIdProcessorTest.php → plugins/Monolog/Test/Unit/Processor/RequestIdProcessorTest.php
+ 4
− 4
Voir le fichier @ 83431266
......@@ -6,15 +6,15 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
namespace Piwik\Tests\Unit\Log\Processor;
namespace Piwik\Plugins\Monolog\Test\Unit\Processor;
use PHPUnit_Framework_TestCase;
use Piwik\Common;
use Piwik\Log\Processor\RequestIdProcessor;
use Piwik\Plugins\Monolog\Processor\RequestIdProcessor;
/**
* @group Core
* @group Log
* @covers \Piwik\Log\Processor\RequestIdProcessor
* @covers \Piwik\Plugins\Monolog\Processor\RequestIdProcessor
*/
class RequestIdProcessorTest extends \PHPUnit_Framework_TestCase
{
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter