diff options
| author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-22 07:18:30 +0400 |
|---|---|---|
| committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-22 07:18:30 +0400 |
| commit | 3fd2dc3cfe4d0ae54d768de7fbf8ad67cc6771d3 (patch) | |
| tree | 5b0992435a88337a1cf338dfba2877df99429824 /tests/travis | |
| parent | d02ddbba22dd07f86356c5ad506ebd253c083c4d (diff) | |
Try to get to php-fpm output (again).
Diffstat (limited to 'tests/travis')
| -rw-r--r-- | tests/travis/php-fpm.ini | 2 | ||||
| -rwxr-xr-x | tests/travis/setup_webserver.sh | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/travis/php-fpm.ini b/tests/travis/php-fpm.ini index 97562df9f4..0a4661e89c 100644 --- a/tests/travis/php-fpm.ini +++ b/tests/travis/php-fpm.ini @@ -8,3 +8,5 @@ pm = static pm.max_children = 2 php_admin_value[memory_limit] = 128M + +error_log = @PHP_FPM_LOG@
\ No newline at end of file diff --git a/tests/travis/setup_webserver.sh b/tests/travis/setup_webserver.sh index 9c32641ea2..39b24dfcb0 100755 --- a/tests/travis/setup_webserver.sh +++ b/tests/travis/setup_webserver.sh @@ -14,12 +14,14 @@ echo "Configuring php-fpm" PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm" PHP_FPM_CONF="$DIR/php-fpm.conf" PHP_FPM_SOCK=$(realpath "$DIR")/php-fpm.sock +PHP_FPM_LOG="$HOME/piwik/tmp/php-fpm.log" USER=$(whoami) # Adjust php-fpm.ini sed -i "s/@USER@/$USER/g" "$DIR/php-fpm.ini" sed -i "s|@PHP_FPM_SOCK@|$PHP_FPM_SOCK|g" "$DIR/php-fpm.ini" +sed -i "s|@PHP_FPM_LOG@|$PHP_FPM_LOG|g" "$DIR/php-fpm.ini" # Setup nginx echo "Configuring nginx" |