diff --git a/.github/workflows/framework.yml b/.github/workflows/framework.yml index 3f6ad1ce005..7151d4e74e0 100644 --- a/.github/workflows/framework.yml +++ b/.github/workflows/framework.yml @@ -43,7 +43,7 @@ jobs: php --ri swoole - name: Laravel Octane Tests - if: matrix.framework == 'Laravel Octane' && matrix.php-version != '8.0' + if: matrix.framework == 'Laravel Octane' run: | git clone https://github.com/laravel/octane.git --depth=1 cd octane/ @@ -51,7 +51,7 @@ jobs: vendor/bin/phpunit - name: Hyperf Tests - if: matrix.framework == 'Hyperf' && matrix.php-version != '8.0' + if: matrix.framework == 'Hyperf' && matrix.php-version != '8.3' env: SW_VERSION: 'master' MYSQL_VERSION: '5.7' diff --git a/src/os/process_pool.cc b/src/os/process_pool.cc index c95196fd9e0..cb535d5a8e3 100644 --- a/src/os/process_pool.cc +++ b/src/os/process_pool.cc @@ -572,6 +572,9 @@ static int ProcessPool_worker_loop_with_task_protocol(ProcessPool *pool, Worker pool->stream_info_->last_connection = conn; } else { n = worker->pipe_worker->read_sync(&out.buf, sizeof(out.buf)); + if (n < 0 && errno != EINTR) { + swoole_sys_warning("read(%d) failed", worker->pipe_worker->fd); + } } /** @@ -720,9 +723,9 @@ static int ProcessPool_worker_loop_with_stream_protocol(ProcessPool *pool, Worke msg.data = pool->packet_buffer; pool->stream_info_->last_connection = conn; } else { - n = worker->pipe_worker->read(pool->packet_buffer, pool->max_packet_size_); + n = worker->pipe_worker->read_sync(pool->packet_buffer, pool->max_packet_size_); if (n < 0 && errno != EINTR) { - swoole_sys_warning("[Worker#%d] read(%d) failed", worker->id, worker->pipe_worker->fd); + swoole_sys_warning("read(%d) failed", worker->pipe_worker->fd); } msg.data = pool->packet_buffer; }