fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Support timeouts for ffmpeg and magick commands

Browse source 
https://rhymix.org/qna/1935749
This commit is contained in:
Kijin Sung 2026-03-31 19:53:08 +09:00
parent ba49fe7b70
commit 81b32378ca
5 changed files with 62 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/file/file.admin.controller.php
View file

@ -122,6 +122,10 @@ class FileAdminController extends File
$config->magick_command = escape(utf8_trim(Context::get('magick_command'))) ?: '';
}
// Timeouts
$config->ffmpeg_timeout = max(0, intval(Context::get('ffmpeg_timeout'))) ?: null;
$config->magick_timeout = max(0, intval(Context::get('magick_timeout'))) ?: null;
// Check maximum file size (probably not necessary anymore)
if (PHP_INT_SIZE < 8)
{
@ -441,6 +445,10 @@ class FileAdminController extends File
'-limit memory 64MB -limit map 128MB -limit disk 1GB',
escapeshellarg($temp_filename),
]);
if (!\RX_WINDOWS && isset($config->magick_timeout) && $config->magick_timeout > 0)
{
$command = 'timeout -k1 ' . intval($config->magick_timeout) . ' ' . $command;
}
@exec($command, $output, $return_var);
$result = $return_var === 0 ? true : false;
}