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

Switch task manager logging to monolog

Browse Source
This commit is contained in:
Romain Neutron
2012-05-24 14:04:33 +02:00
parent 8b43e36532
commit 3c2d16fd00
8 changed files with 88 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/record/Interface.class.php
View File

@@ -10,6 +10,7 @@
*/
use MediaVorus\Media\Media;
use Monolog\Logger;
/**
*
@@ -99,7 +100,7 @@ interface record_Interface
public function delete();
public function generate_subdefs(databox $databox, Array $wanted_subdefs = null);
public function generate_subdefs(databox $databox, Logger $logger = null, Array $wanted_subdefs = null);
public function log_view($log_id, $referrer, $gv_sit);

27
lib/classes/record/adapter.class.php
View File

@@ -9,6 +9,7 @@
* file that was distributed with this source code.
*/
use Monolog\Logger;
use MediaVorus\Media\Media;
use Symfony\Component\HttpFoundation\File\File as SymfoFile;
@@ -1647,15 +1648,23 @@ class record_adapter implements record_Interface, cache_cacheableInterface
}
/**
* Generates subdefs
*
* @param databox $databox
* @param databox $databox The databox
* @param \Monolog\Logger $logger A logger for binary operation
* @param array $wanted_subdefs An array of subdef names
* @return \record_adapter
*/
public function generate_subdefs(databox $databox, Array $wanted_subdefs = null)
public function generate_subdefs(databox $databox, Logger $logger = null, Array $wanted_subdefs = null)
{
$subdefs = $databox->get_subdef_structure()->getSubdefGroup($this->get_type());
$Core = bootstrap::getCore();
if ( ! $logger) {
$logger = $Core['monolog'];
}
if ( ! $subdefs) {
$Core['monolog']->addInfo(sprintf('Nothing to do for %s', $this->get_type()));
@@ -1682,7 +1691,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$pathdest = $this->generateSubdefPathname($subdef, $pathdest);
$this->generate_subdef($subdef, $pathdest);
$this->generate_subdef($subdef, $pathdest, $logger);
if (file_exists($pathdest)) {
$media = \MediaVorus\MediaVorus::guess(new \SplFileInfo($pathdest));
@@ -1712,12 +1721,14 @@ class record_adapter implements record_Interface, cache_cacheableInterface
}
/**
* Generate a subdef
*
* @todo move to media_subdef class
* @param databox_subdef $subdef_class
* @param string $pathdest
* @param databox_subdef $subdef_class The related databox subdef
* @param type $pathdest The destination of the file
* @param Logger $logger A logger for binary operation
* @return \record_adapter
*/
protected function generate_subdef(databox_subdef $subdef_class, $pathdest)
protected function generate_subdef(databox_subdef $subdef_class, $pathdest, Logger $logger)
{
$Core = \bootstrap::getCore();
@@ -1730,7 +1741,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$Core['media-alchemyst']->turnInto($pathdest, $subdef_class->getSpecs());
$Core['media-alchemyst']->close();
} catch (\MediaAlchemyst\Exception\Exception $e) {
$Core['monolog']->addError(sprintf('Subdef generation failed with message %s', $e->getMessage()));
$logger->addError(sprintf('Subdef generation failed for record %d with message %s', $this->get_record_id(), $e->getMessage()));
}
return $this;