diff options
| author | Michael Griego <mgriego@users.noreply.github.com> | 2021-03-24 17:03:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 22:03:48 +0000 |
| commit | 9b057aafb0c41bab63870277c53307d3d6dc572b (patch) | |
| tree | 6f24b39c47be7ad0f4b0528054f5e7c3772d4344 /19.0 | |
| parent | f1ca6dbfab022e44b8aed9909939a4c43726d2f2 (diff) | |
Enable session locking for the redis session handler and use more sane locking configs. (#1364)
Signed-off-by: Mike Griego <mike@griegocentral.com>
Diffstat (limited to '19.0')
| -rwxr-xr-x | 19.0/apache/entrypoint.sh | 5 | ||||
| -rwxr-xr-x | 19.0/fpm-alpine/entrypoint.sh | 5 | ||||
| -rwxr-xr-x | 19.0/fpm/entrypoint.sh | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/19.0/apache/entrypoint.sh b/19.0/apache/entrypoint.sh index bee572c2..b6da893b 100755 --- a/19.0/apache/entrypoint.sh +++ b/19.0/apache/entrypoint.sh @@ -69,6 +69,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP else echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\"" fi + echo "redis.session.locking_enabled = 1" + echo "redis.session.lock_retries = -1" + # redis.session.lock_wait_time is specified in microseconds. + # Wait 10ms before retrying the lock rather than the default 2ms. + echo "redis.session.lock_wait_time = 10000" } > /usr/local/etc/php/conf.d/redis-session.ini fi diff --git a/19.0/fpm-alpine/entrypoint.sh b/19.0/fpm-alpine/entrypoint.sh index bee572c2..b6da893b 100755 --- a/19.0/fpm-alpine/entrypoint.sh +++ b/19.0/fpm-alpine/entrypoint.sh @@ -69,6 +69,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP else echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\"" fi + echo "redis.session.locking_enabled = 1" + echo "redis.session.lock_retries = -1" + # redis.session.lock_wait_time is specified in microseconds. + # Wait 10ms before retrying the lock rather than the default 2ms. + echo "redis.session.lock_wait_time = 10000" } > /usr/local/etc/php/conf.d/redis-session.ini fi diff --git a/19.0/fpm/entrypoint.sh b/19.0/fpm/entrypoint.sh index bee572c2..b6da893b 100755 --- a/19.0/fpm/entrypoint.sh +++ b/19.0/fpm/entrypoint.sh @@ -69,6 +69,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP else echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\"" fi + echo "redis.session.locking_enabled = 1" + echo "redis.session.lock_retries = -1" + # redis.session.lock_wait_time is specified in microseconds. + # Wait 10ms before retrying the lock rather than the default 2ms. + echo "redis.session.lock_wait_time = 10000" } > /usr/local/etc/php/conf.d/redis-session.ini fi |