hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add second logging channel

Browse Source
This commit is contained in:
Romain Neutron
2013-07-01 14:38:17 +02:00
parent 24f6f19731
commit ce34bca408
8 changed files with 91 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Alchemy/Phrasea/Command/Command.php
View File

@@ -37,7 +37,21 @@ abstract class Command extends SymfoCommand
{
if ($input->getOption('verbose')) {
$handler = new StreamHandler('php://stdout');
$this->container['monolog']->pushHandler($handler);
$this->container['monolog'] = $this->container->share(
$this->container->extend('monolog', function($logger, $app) use ($handler) {
$logger->pushHandler($handler);
return $logger;
})
);
$this->container['task-manager.logger'] = $this->container->share(
$this->container->extend('task-manager.logger', function($logger, $app) use ($handler) {
$logger->pushHandler($handler);
return $logger;
})
);
}
return $this->doExecute($input, $output);

35
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
View File

@@ -13,37 +13,22 @@ namespace Alchemy\Phrasea\Core\Provider;
use Silex\Application;
use Silex\ServiceProviderInterface;
use Monolog\Handler\SyslogHandler;
use Monolog\Handler\NativeMailerHandler;
use Alchemy\Phrasea\Exception\RuntimeException;
use Monolog\Logger;
use Monolog\Handler\NullHandler;
class TaskManagerServiceProvider implements ServiceProviderInterface
{
public function register(Application $app)
{
$app['task-manager.logger'] = $app->share(function(Application $app) {
$logger = new Logger('task-manager logger');
$logger->pushHandler(new NullHandler());
return $logger;
});
$app['task-manager'] = $app->share(function(Application $app) {
$logger = clone $app['monolog'];
$options = $app['phraseanet.configuration']['main']['task-manager']['options'];
if (isset($options['syslog_level']) && null !== $syslogLevel = constant($options['syslog_level'])) {
$handler = new SyslogHandler("Phraseanet-Task", "user", $syslogLevel);
$logger->pushHandler($handler);
}
if (isset($options['maillog_level']) && null !== $maillogLevel = constant($options['maillog_level'])) {
if ('' === $adminMail = trim($app['phraseanet.registry']->get('GV_adminMail'))) {
throw new RuntimeException("Admininstrator mail must be set to get log by mail.");
}
$senderMail = $app['phraseanet.registry']->get('GV_defaultmailsenderaddr');
$handler = new NativeMailerHandler($adminMail, "Phraseanet-Task", $senderMail, $maillogLevel);
$logger->pushHandler($handler);
}
return new \task_manager($app, $logger);
return new \task_manager($app, $app['task-manager.logger']);
});
}

2
lib/Alchemy/Phrasea/Core/Version.php
View File

@@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core;
*/
class Version
{
protected static $number = '3.8.0.a13';
protected static $number = '3.8.0.a14';
protected static $name = 'Carnosaurus';
public static function getNumber()