Skip to content

Commit 93dfdb5

Browse files
[1.x] Adds support for Swoole 5 (#560)
* Adds support for Swoole 5 * Update OnWorkerStart.php Co-authored-by: Taylor Otwell <[email protected]>
1 parent b96faad commit 93dfdb5

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/Swoole/Handlers/OnServerStart.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Laravel\Octane\Swoole\Actions\EnsureRequestsDontExceedMaxExecutionTime;
66
use Laravel\Octane\Swoole\ServerStateFile;
77
use Laravel\Octane\Swoole\SwooleExtension;
8+
use Swoole\Timer;
89

910
class OnServerStart
1011
{
@@ -37,13 +38,13 @@ public function __invoke($server)
3738
}
3839

3940
if ($this->shouldTick) {
40-
$server->tick(1000, function () use ($server) {
41+
Timer::tick(1000, function () use ($server) {
4142
$server->task('octane-tick');
4243
});
4344
}
4445

4546
if ($this->maxExecutionTime > 0) {
46-
$server->tick(1000, function () use ($server) {
47+
Timer::tick(1000, function () use ($server) {
4748
(new EnsureRequestsDontExceedMaxExecutionTime(
4849
$this->extension, $this->timerTable, $this->maxExecutionTime, $server
4950
))();

src/Swoole/Handlers/OnWorkerStart.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,7 @@ protected function bootWorker($server)
8383
*/
8484
protected function dispatchServerTickTaskEverySecond($server)
8585
{
86-
// if ($this->workerState->workerId === 0 &&
87-
// ($this->serverState['octaneConfig']['tick'] ?? true)) {
88-
// $this->workerState->tickTimerId = $server->tick(1000, function () use ($server) {
89-
// $server->task('octane-tick');
90-
// });
91-
// }
86+
// ...
9287
}
9388

9489
/**

0 commit comments

Comments
 (0)