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

Add task manager logs configuration

Browse Source
This commit is contained in:
Romain Neutron
2014-01-31 15:05:57 +01:00
parent 4d55ff11d2
commit f59fc65d13
5 changed files with 103 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/configuration.sample.yml
View File

@@ -26,6 +26,11 @@ main:
search-engine:
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
options: []
task-manager:
logger:
max-files: 10
enabled: true
level: INFO
binaries:
ghostscript_binary: null
php_binary: null

14
lib/classes/module/console/schedulerStart.php
View File

@@ -41,9 +41,21 @@ class module_console_schedulerStart extends Command
$streamHandler = new Handler\StreamHandler('php://stdout', $input->getOption('verbose') ? Logger::DEBUG : Logger::WARNING);
$logger->pushHandler($streamHandler);
$taskManagerConf = isset($this->container['phraseanet.configuration']['main']['task-manager']) ? $this->container['phraseanet.configuration']['main']['task-manager'] : array();
$taskManagerConf = array_replace_recursive(array(
'logger' => array(
'enabled' => true,
'level' => 'INFO',
'max-files' => 10,
)
), $taskManagerConf);
if ($taskManagerConf['logger']['enabled']) {
$level = defined('Monolog\\Logger::'.$taskManagerConf['logger']['level']) ? constant('Monolog\\Logger::'.$taskManagerConf['logger']['level']) : Logger::INFO;
$logfile = __DIR__ . '/../../../../logs/scheduler.log';
$rotateHandler = new Handler\RotatingFileHandler($logfile, 10, Logger::INFO);
$rotateHandler = new Handler\RotatingFileHandler($logfile, $taskManagerConf['logger']['max-files'], $level);
$logger->pushHandler($rotateHandler);
}
try {
$scheduler = new task_Scheduler($this->container, $logger);

15
lib/classes/module/console/taskrun.php
View File

@@ -96,8 +96,21 @@ class module_console_taskrun extends Command
}
}
$taskManagerConf = isset($this->container['phraseanet.configuration']['main']['task-manager']) ? $this->container['phraseanet.configuration']['main']['task-manager'] : array();
$taskManagerConf = array_replace_recursive(array(
'logger' => array(
'enabled' => true,
'level' => 'INFO',
'max-files' => 10,
)
), $taskManagerConf);
if ($taskManagerConf['logger']['enabled']) {
$level = defined('Monolog\\Logger::'.$taskManagerConf['logger']['level']) ? constant('Monolog\\Logger::'.$taskManagerConf['logger']['level']) : Logger::INFO;
$logfile = __DIR__ . '/../../../../logs/task_' . $task_id . '.log';
$this->container['task-manager.logger']->pushHandler(new RotatingFileHandler($logfile, 10, Logger::INFO));
$this->container['task-manager.logger']->pushHandler(new RotatingFileHandler($logfile, $taskManagerConf['logger']['max-files'], $level));
}
$this->task = $task_manager->getTask($task_id, $this->container['task-manager.logger']);
$lib2v = array(

63
lib/classes/patch/383alpha5a.php Normal file
View File

@@ -0,0 +1,63 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2014 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Application;
class patch_383alpha5a implements patchInterface
{
/** @var string */
private $release = '3.8.3-alpha.5';
/** @var array */
private $concern = array(base::APPLICATION_BOX);
/**
* {@inheritdoc}
*/
public function get_release()
{
return $this->release;
}
/**
* {@inheritdoc}
*/
public function require_all_upgrades()
{
return false;
}
/**
* {@inheritdoc}
*/
public function concern()
{
return $this->concern;
}
/**
* {@inheritdoc}
*/
public function apply(base $appbox, Application $app)
{
$config = $app['phraseanet.configuration']->getConfig();
$config['main']['task-manager']['logger'] = array(
'enabled' => true,
'max-files' => 10,
'level' => 'INFO',
);
$app['phraseanet.configuration']->setConfig($config);
return true;
}
}

5
lib/conf.d/configuration.yml
View File

@@ -26,6 +26,11 @@ main:
search-engine:
type: Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine
options: []
task-manager:
logger:
max-files: 10
enabled: true
level: INFO
trusted-proxies: []
debugger:
allowed-ips: []