Merge pull request #3372 from alchemy-fr/PHRAS-2943-set-exiftool-timeout

PHRAS-2943 #comment merge 4.1 Set exiftool timeout, default is 60 secondes
This commit is contained in:
Nicolas Maillat
2020-02-24 15:52:01 +01:00
committed by GitHub
3 changed files with 20 additions and 1 deletions

View File

@@ -103,6 +103,7 @@ main:
mp4box_timeout: 60
swftools_timeout: 60
unoconv_timeout: 60
exiftool_timeout: 60
storage:
subdefs: null
cache: null

View File

@@ -9,6 +9,8 @@ use MediaVorus\MediaVorusServiceProvider;
use MP4Box\MP4BoxServiceProvider;
use Neutron\Silex\Provider\ImagineServiceProvider;
use PHPExiftool\PHPExiftoolServiceProvider;
use PHPExiftool\Reader;
use PHPExiftool\Writer;
use Silex\Application;
use Silex\ServiceProviderInterface;
@@ -48,6 +50,21 @@ class MediaUtilitiesMetaServiceProvider implements ServiceProviderInterface
public function boot(Application $app)
{
// no-op
if(isset($app['exiftool.reader']) && isset($app['conf'])) {
try {
$timeout = $app['conf']->get(['main', 'binaries', 'exiftool_timeout'], 60);
/** @var Reader $exiftoolReader */
$exiftoolReader = $app['exiftool.reader'];
$exiftoolReader->setTimeout($timeout);
/** @var Writer $exiftoolWriter */
$exiftoolWriter = $app['exiftool.writer'];
$exiftoolWriter->setTimeout($timeout);
}
catch(\Exception $e) {
// no-nop
}
}
}
}

View File

@@ -103,6 +103,7 @@ main:
mp4box_timeout: 60
swftools_timeout: 60
unoconv_timeout: 60
exiftool_timeout: 60
storage:
subdefs: null
cache: null