public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #370 from hason/config_timeout 

Added config directive 'process-timeout'
pull/375/head
Jordi Boggiano 2012-02-27 00:27:47 -08:00
parent 29a1a2a424 9b03b7e915
commit 7ae2a7fb99
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Factory.php
View File

@ -52,6 +52,7 @@ class Factory
// Configuration defaults // Configuration defaults
$composerConfig = array( $composerConfig = array(
'vendor-dir' => 'vendor', 'vendor-dir' => 'vendor',
'process-timeout' => 60,
); );
$packageConfig = $file->read(); $packageConfig = $file->read();
@ -69,9 +70,8 @@ class Factory
$binDir = getenv('COMPOSER_BIN_DIR') ?: $packageConfig['config']['bin-dir']; $binDir = getenv('COMPOSER_BIN_DIR') ?: $packageConfig['config']['bin-dir'];
// setup process timeout // setup process timeout
if (false !== getenv('COMPOSER_PROCESS_TIMEOUT')) { $processTimeout = getenv('COMPOSER_PROCESS_TIMEOUT') ?: $packageConfig['config']['process-timeout']
ProcessExecutor::setTimeout((int) getenv('COMPOSER_PROCESS_TIMEOUT')); ProcessExecutor::setTimeout((int) $processTimeout);
}
// initialize repository manager // initialize repository manager
$rm = $this->createRepositoryManager($io); $rm = $this->createRepositoryManager($io);