diff options
| author | Christian Schneider | 2011-12-15 15:03:39 +0000 | 
|---|---|---|
| committer | Christian Schneider | 2011-12-15 15:03:39 +0000 | 
| commit | 7e8f70d380a9067777d1a755a0c6aeed808baeb1 (patch) | |
| tree | aaeb892c409e5e92b07281a152e2568fb2c8ac70 | |
| parent | 4e273dd5062c54d34c7de3de6890584ce142dd8f (diff) | |
| download | itools-7e8f70d380a9067777d1a755a0c6aeed808baeb1.tar.gz itools-7e8f70d380a9067777d1a755a0c6aeed808baeb1.tar.bz2 itools-7e8f70d380a9067777d1a755a0c6aeed808baeb1.zip | |
Reduce it::imageconvert ultratimeout from 10 minutes to 30 seconds
| -rw-r--r-- | it.class | 2 | 
1 files changed, 1 insertions, 1 deletions
| @@ -559,7 +559,7 @@ static function imageconvert($p)  	$type = strtr($type, array("jpeg" => "jpg", "tiff" => "tif", "ps" => "eps", "ept" => "eps"));  	$p += array('type' => $type, 'types' => "bmp,eps,gif,jp2,jpg,png,svg,tif");  	$p['-opts'] = array('-thumbnail' => $p['size']) + (array)$p['-opts']; -	$ultratimeout = file_exists("/opt/ultra/bin/ultratimeout") ? "/opt/ultra/bin/ultratimeout 600 " : ""; +	$ultratimeout = file_exists("/opt/ultra/bin/ultratimeout") ? "/opt/ultra/bin/ultratimeout 30 " : "";  	if (in_array($type, explode(',', $p['types'])))	# Valid type?  		$cmdoutput = it::exec($ultratimeout . 'gm convert 2>&1 -flatten -quality 75 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p); |