diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-03 23:17:37 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-03 23:17:37 +0800 |
| commit | 6183408031d9d01ac6ee5ea894f53d1a3e744044 (patch) | |
| tree | 8a48932c9399131c1f6adddf0b12ed167d0c436b | |
| parent | 808e562f23fcc758c5ffc9b5e2f88429af3add7f (diff) | |
| parent | 837eeefee9e01156b364a4b0e9cff8d9f0a1a1d5 (diff) | |
| download | php-git-6183408031d9d01ac6ee5ea894f53d1a3e744044.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -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 7a0bebe428..cb9eedc996 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -582,7 +582,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_INFO, "Killed locker %d", mem_usage_check->l_pid); + zend_accel_error(ACCEL_LOG_ERROR, "Killed locker %d", mem_usage_check->l_pid); if (kill(mem_usage_check->l_pid, SIGKILL)) { break; } @@ -595,7 +595,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check) usleep(10000); } if (!tries) { - zend_accel_error(ACCEL_LOG_INFO, "Can't kill %d after 20 tries!", mem_usage_check->l_pid); + zend_accel_error(ACCEL_LOG_ERROR, "Can't kill %d after 20 tries!", mem_usage_check->l_pid); ZCSG(force_restart_time) = time(NULL); /* restore forced restart request */ } |