proccess timeout fix. The hooks are not honoring the composer default.

sibrus · Jul 12, 2012 · fd46abe · fd46abe
1 parent b2b18d7
commit fd46abe
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Composer/ScriptHandler.php b/Composer/ScriptHandler.php
@@ -31,7 +31,7 @@ public static function buildBootstrap($event)
             return;
         }
 
-        static::executeBuildBootstrap($appDir);
+        static::executeBuildBootstrap($appDir, $options['process-timeout']);
     }
 
     public static function clearCache($event)
@@ -45,7 +45,7 @@ public static function clearCache($event)
             return;
         }
 
-        static::executeCommand($event, $appDir, 'cache:clear --no-warmup');
+        static::executeCommand($event, $appDir, 'cache:clear --no-warmup', $options['process-timeout']);
     }
 
     public static function installAssets($event)
@@ -123,25 +123,25 @@ public static function doBuildBootstrap($appDir)
             ", substr(file_get_contents($file), 5)));
     }
 
-    protected static function executeCommand($event, $appDir, $cmd)
+    protected static function executeCommand($event, $appDir, $cmd, $timeout = 300)
     {
         $php = escapeshellarg(self::getPhp());
         $console = escapeshellarg($appDir.'/console');
         if ($event->getIO()->isDecorated()) {
             $console.= ' --ansi';
         }
 
-        $process = new Process($php.' '.$console.' '.$cmd, null, null, null, 300);
+        $process = new Process($php.' '.$console.' '.$cmd, null, null, null, $timeout);
         $process->run(function ($type, $buffer) { echo $buffer; });
     }
 
-    protected static function executeBuildBootstrap($appDir)
+    protected static function executeBuildBootstrap($appDir, $timeout = 300)
     {
         $php = escapeshellarg(self::getPhp());
         $cmd = escapeshellarg(__DIR__.'/../Resources/bin/build_bootstrap.php');
         $appDir = escapeshellarg($appDir);
 
-        $process = new Process($php.' '.$cmd.' '.$appDir, null, null, null, 300);
+        $process = new Process($php.' '.$cmd.' '.$appDir, null, null, null, $timeout);
         $process->run(function ($type, $buffer) { echo $buffer; });
     }
 
@@ -155,6 +155,8 @@ protected static function getOptions($event)
 
         $options['symfony-assets-install'] = getenv('SYMFONY_ASSETS_INSTALL') ?: $options['symfony-assets-install'];
 
+        $options['process-timeout'] = $event->getComposer()->getConfig()->get('process-timeout');
+
         return $options;
     }