Skip to content

Update Swoole version + Fixed Push/Pop #4265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 17, 2018
Merged

Update Swoole version + Fixed Push/Pop #4265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a36a91
Updated Swoole version from 2.1.3 to 4.2.9
Indribell Dec 17, 2018
f7e1be3
Changed push/pop to enqueue/dequeue
Indribell Dec 17, 2018
ce65728
Merge pull request #1 from Indribell/patch-1
Indribell Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frameworks/PHP/swoole/swoole-server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,17 +232,17 @@ function set_host_ip()

function put($db)
{
$this->pool->push($db);
$this->pool->enqueue($db);
$this->pool_count++;
}

function get(string $server_type)
{
if ($this->pool_count > 0) {
$this->pool_count--;
return $this->pool->pop();
return $this->pool->dequeue();
}

// No idle connection, time to create a new connection
if ($server_type === 'mysql') {
$db = new Swoole\Coroutine\Mysql;
Expand Down
2 changes: 1 addition & 1 deletion frameworks/PHP/swoole/swoole.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM php:7.2

ENV SWOOLE_VERSION=2.1.3
ENV SWOOLE_VERSION=4.2.9

RUN cd /tmp && curl -sSL "https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz" | tar xzf - \
&& cd swoole-src-${SWOOLE_VERSION} \
Expand Down