diff options
| author | Keyur <kgovande@etsy.com> | 2016-07-13 02:47:46 +0000 |
|---|---|---|
| committer | Keyur <kgovande@etsy.com> | 2016-07-13 03:01:26 +0000 |
| commit | b512f4a95614891a512b0da674c1a9d22a40869e (patch) | |
| tree | f0fdc6e99a995d7b44beb521915e436d7fa3b7b3 /ext | |
| parent | be77ce37fd3290365a359f7143cc636d66f14cf1 (diff) | |
| download | php-git-b512f4a95614891a512b0da674c1a9d22a40869e.tar.gz | |
Fixes #72590: Opcache restart with kill_all_lockers does not work
ACCEL_LOG_ERROR is special and causes a zend_bailout() and the code
never gets to call kill() in the next line after the logging. Change
the log level to WARNING.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 2cfe5390b3..f756f37a48 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -625,7 +625,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check) ZCSG(force_restart_time) = 0; while (mem_usage_check->l_pid > 0) { while (tries--) { - zend_accel_error(ACCEL_LOG_ERROR, "Killed locker %d", mem_usage_check->l_pid); + zend_accel_error(ACCEL_LOG_WARNING, "Killed locker %d", mem_usage_check->l_pid); if (kill(mem_usage_check->l_pid, SIGKILL)) { break; } @@ -638,7 +638,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check) usleep(10000); } if (!tries) { - zend_accel_error(ACCEL_LOG_ERROR, "Can't kill %d after 20 tries!", mem_usage_check->l_pid); + zend_accel_error(ACCEL_LOG_WARNING, "Can't kill %d after 10 tries!", mem_usage_check->l_pid); ZCSG(force_restart_time) = time(NULL); /* restore forced restart request */ } |