Skip to content
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

add pcntl_signal_dispatch after job finish for php extension #485

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

add pcntl_signal_dispatch after job finish for php extension #485

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e58a2de
add pcntl_signal_dispatch after job finish for php extension
dimansuvorlinda Apr 26, 2023
0ee4e16
update package name
dimansuvorlinda Apr 27, 2023
738abad
Merge pull request #1 from yiisoft/master
dimanzver Jun 18, 2023
97ba157
remove ugly signal handling fix, don`t process signals for amqp exten…
dimansuvorlinda Jun 18, 2023
01a32b2
Ignore signal for amqp extension while job is executing
dimansuvorlinda Jun 18, 2023
bd92d80
fix exiting for docker
dimansuvorlinda Jul 14, 2023
bc13f4c
try run pcntl_signal_dispatch on start and end of job
dimansuvorlinda Jul 15, 2023
ee9b7f5
add job params logging
dimansuvorlinda Jun 10, 2024
b30b3ab
Update composer.json
samdark Jun 11, 2024
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
Prev Previous commit
Next Next commit
Ignore signal for amqp extension while job is executing
  • Loading branch information
@dimansuvorlinda
dimansuvorlinda committed Jun 18, 2023
commit 01a32b267aa6b25b130e222558540d3263fd59b6
28 changes: 28 additions & 0 deletions src/drivers/amqp_interop/Queue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,21 @@ public function listen()
return true;
}

// Ignore signal for amqp extension while job is executing
if (
extension_loaded('pcntl') && function_exists('pcntl_signal') && PHP_MAJOR_VERSION >= 7 &&
$this->driver === self::ENQUEUE_AMQP_EXT
) {
$signals = [SIGTERM, SIGQUIT, SIGINT, SIGHUP];

foreach ($signals as $signal) {
pcntl_signal($signal, static function ($signal) {
pcntl_signal($signal, SIG_DFL);
posix_kill(posix_getpid(), $signal);
});
}
}

$ttr = $message->getProperty(self::TTR);
$attempt = $message->getProperty(self::ATTEMPT, 1);

Expand All @@ -336,6 +351,19 @@ public function listen()
$this->redeliver($message);
}

// For amqp extension: restore default signal handlers
if (
extension_loaded('pcntl') && function_exists('pcntl_signal') && PHP_MAJOR_VERSION >= 7 &&
$this->driver === self::ENQUEUE_AMQP_EXT
) {
pcntl_signal_dispatch();

$signals = [SIGTERM, SIGQUIT, SIGINT, SIGHUP];
foreach ($signals as $signal) {
pcntl_signal($signal, SIG_DFL);
}
}

return true;
};

Expand Down